From patchwork Sun Dec 15 19:21:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Pakki X-Patchwork-Id: 11293135 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9EE31112B for ; Sun, 15 Dec 2019 19:21:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C0F4206D7 for ; Sun, 15 Dec 2019 19:21:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="XwkLQ/E+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726260AbfLOTVi (ORCPT ); Sun, 15 Dec 2019 14:21:38 -0500 Received: from mta-p8.oit.umn.edu ([134.84.196.208]:51394 "EHLO mta-p8.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726146AbfLOTVh (ORCPT ); Sun, 15 Dec 2019 14:21:37 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id 47bZ5Y1qN5z9vYW2 for ; Sun, 15 Dec 2019 19:21:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WeFW4Ddjc9mI for ; Sun, 15 Dec 2019 13:21:37 -0600 (CST) Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p8.oit.umn.edu (Postfix) with ESMTPS id 47bZ5Y0bmCz9vYVX for ; Sun, 15 Dec 2019 13:21:37 -0600 (CST) Received: by mail-yb1-f199.google.com with SMTP id 132so4929436ybd.3 for ; Sun, 15 Dec 2019 11:21:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1vHOqiJl20VaJGpwJ/DttRyIXYs0oZzT4qiDHtKALOA=; b=XwkLQ/E+DIobu7olpQXcCUCO7xgWE16Wa+sqh198+1y2rWLsbgYeAtZPo4ATxLWAqT T8vWLEWjUe4KqkXBKyC+62kbzFkuOtkxer4fq23IUHJbGAQDj64DFtHm+kpNe2oxX208 e0dQ2BD9rXOPFMFn+1qabFkqPlI6WfG901cX3YmXLLUpviJ2C1BobnEpvHhM1iUMTriA Y3KHs/XW6wbjL24W84XLn/BzdiuXAtj0vjMQOW9Q6frQFA9uX5oRnLOXXf5v0Bas8ABO llFVO7zrOHwm8kcPgz+6hu9y73wBkNIJ5L00KdVC3M6VfX8KW6MHmKm9A3W7UEqpOfWo RW8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1vHOqiJl20VaJGpwJ/DttRyIXYs0oZzT4qiDHtKALOA=; b=QhqCFR7yfw66A3k5XJ855J5mDi3j0rnqsG5O+R0P7iNhZMAGdis5Egw5oYDH9U3JcA nuJl3m4kaUm1PDJjP19bWQOE/b/z2SbUDA0Uf1QcfJHxvFH47ReNlKrUHA0NwwfbSQ3H rpYGic1DnmbWzkyZ9jwUz4p5728mVbA5PKEAVTJn+Gxj6VFVTXCXLZk0x0EUdtlXkPGy Vc+9n2DkqPLhIup2WGqz5Ypu4HgJc5rAFmCgoO+RVU+eOj94Z21C4XB2j4t1P2wpcs9w bhWkn8rIZ17QZkMSIeLX19+73nWz2kQkRJZxwtiJjMg1WDyXAnWLFEHgEvQunawsHs5o +HBQ== X-Gm-Message-State: APjAAAXDt6QnUvK15BetQbIgIpzGn7mVbAgssalUnPjI3moX43umd8tq F8lGO2JUqV/m+dILjNJ4C0AmlQnrsbRrFKppDVn4IfJAUm/bZtqArfY4Q87oJdq0RhrSsbYFRJU XcOBMXT0gOvt2H9i1Wll4E0hbsWQ= X-Received: by 2002:a25:ca03:: with SMTP id a3mr16801068ybg.326.1576437696610; Sun, 15 Dec 2019 11:21:36 -0800 (PST) X-Google-Smtp-Source: APXvYqyaR6yQwrbYT3Z38wr+UIe4edmcqRkTgpqg+r4yw4b+9er5V3fIAM9v8isICn729UCWrJAffw== X-Received: by 2002:a25:ca03:: with SMTP id a3mr16801054ybg.326.1576437696352; Sun, 15 Dec 2019 11:21:36 -0800 (PST) Received: from cs-u-syssec1.dtc.umn.edu (cs-u-syssec1.cs.umn.edu. [128.101.106.66]) by smtp.gmail.com with ESMTPSA id a12sm7488523ywa.95.2019.12.15.11.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 11:21:36 -0800 (PST) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, Hans Verkuil , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: saa7146: Avoid using BUG_ON as an assertion Date: Sun, 15 Dec 2019 13:21:33 -0600 Message-Id: <20191215192133.3765-1-pakki001@umn.edu> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org In video_begin and video_end, saa7146_format_by_fourcc can return NULL and is checked via BUG_ON. However, by returning the error to the callers upstream, we can avoid the crash and handle it via recovery code. Signed-off-by: Aditya Pakki --- drivers/media/common/saa7146/saa7146_video.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/common/saa7146/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c index d16122039b0c..1b6b5d43ad3e 100644 --- a/drivers/media/common/saa7146/saa7146_video.c +++ b/drivers/media/common/saa7146/saa7146_video.c @@ -345,7 +345,8 @@ static int video_begin(struct saa7146_fh *fh) fmt = saa7146_format_by_fourcc(dev, vv->video_fmt.pixelformat); /* we need to have a valid format set here */ - BUG_ON(NULL == fmt); + if (NULL == fmt) + return -EINVAL; if (0 != (fmt->flags & FORMAT_IS_PLANAR)) { resource = RESOURCE_DMA1_HPS|RESOURCE_DMA2_CLP|RESOURCE_DMA3_BRS; @@ -398,7 +399,8 @@ static int video_end(struct saa7146_fh *fh, struct file *file) fmt = saa7146_format_by_fourcc(dev, vv->video_fmt.pixelformat); /* we need to have a valid format set here */ - BUG_ON(NULL == fmt); + if (NULL == fmt) + return -EINVAL; if (0 != (fmt->flags & FORMAT_IS_PLANAR)) { resource = RESOURCE_DMA1_HPS|RESOURCE_DMA2_CLP|RESOURCE_DMA3_BRS;