From patchwork Tue Feb 14 23:32:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 13141015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 14680C05027 for ; Tue, 14 Feb 2023 23:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=bnnICrm3G1yu+SWATRgG3hHidmOrR0oAvuvTtJO17g8=; b=Po7xn8Xi4k0CqO cTBW77ZoPMkQiZayBnnnPNaNxfgQVjzJruZ6u0d1qfMUzmO5OJ8MhE+AIUtN5XnmtCKpoC9Ts1dKe DMsnFDGadyn0SOUw8KlHXzzlURT3qwYRYDIFMNBgysY2NeKiPoR4/NaU7CIXNmDZdmmPSs9rFdgg7 D0JQAWmwylQN9pyLet+wvsc2EuyKnsWeHiyJiXXVQMtcko9QhHVSjD+xLBZxNXK7X46kS33TPgzlw NMbx2YEt/1pyX7Hfamdu5+emDfFIbHoNFtl7w06QCi/Up1h4ryxNIZzkkwcek4pEMHzfA0boUX+pl tbzpe+d5LPxKe6to8kbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS4n2-003tzh-VV; Tue, 14 Feb 2023 23:32:49 +0000 Received: from phobos.denx.de ([2a01:238:438b:c500:173d:9f52:ddab:ee01]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS4n0-003tz9-9a for linux-arm-kernel@lists.infradead.org; Tue, 14 Feb 2023 23:32:47 +0000 Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 9B0E48597D; Wed, 15 Feb 2023 00:32:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1676417564; bh=Ydcfckh08fdrY25On7XbN0Dw3yLwnNKhJVS7GXEwseA=; h=From:To:Cc:Subject:Date:From; b=KopsVYnnxKkSh4KIi6ilKIi9Z4825e+qP4mdGkAt4/GPuDW0ul2zbtjxxeBOFoCIG 3IMitWYkM3IWVIJ63LYX6+j5YQQ43kMq9/UeMayn7C0s6yJKqBTgSH7rLKn7XuhAiP 5dZEnUyk8+aWRYM0MwITj50GP7PqGesZpO3yatQ2Jr9iy6OwOYxgypUnYsm1DFHzDw VvZDeec+KnCYn4y/TRyfmjKRY4RkfVUcF8hBdCMkOKeHWH8wkaDOwkPuxHPQbvM7/r pPjehnNb5w7mtyn/dMWUZNm+aEmL4PNFXPCo94hm8oKWiU98M/6th7+sZJKXtvU9WW yAVHLiENJLh/w== From: Marek Vasut To: linux-media@vger.kernel.org Cc: Marek Vasut , Laurent Pinchart , Fabio Estevam , Mauro Carvalho Chehab , NXP Linux Team , Pengutronix Kernel Team , Philipp Zabel , Rui Miguel Silva , Sascha Hauer , Shawn Guo , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] media: imx-mipi-csis: Check csis_fmt validity before use Date: Wed, 15 Feb 2023 00:32:33 +0100 Message-Id: <20230214233233.177122-1-marex@denx.de> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230214_153246_591670_31D37397 X-CRM114-Status: GOOD ( 11.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The find_csis_format() may return NULL in case supported format is not found, check the return value of find_csis_format() before using the result to avoid NULL pointer dereference. Reviewed-by: Laurent Pinchart Fixes: 11927d0fd0d0 ("media: imx-mipi-csis: Use V4L2 subdev active state") Signed-off-by: Marek Vasut --- Cc: Fabio Estevam Cc: Laurent Pinchart Cc: Mauro Carvalho Chehab Cc: NXP Linux Team Cc: Pengutronix Kernel Team Cc: Philipp Zabel Cc: Rui Miguel Silva Cc: Sascha Hauer Cc: Shawn Guo Cc: linux-arm-kernel@lists.infradead.org Cc: linux-media@vger.kernel.org --- V2: Add blank line --- drivers/media/platform/nxp/imx-mipi-csis.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c index e99633565463e..2731ae94cb031 100644 --- a/drivers/media/platform/nxp/imx-mipi-csis.c +++ b/drivers/media/platform/nxp/imx-mipi-csis.c @@ -1109,6 +1109,9 @@ static int mipi_csis_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad, csis_fmt = find_csis_format(fmt->code); v4l2_subdev_unlock_state(state); + if (!csis_fmt) + return -EINVAL; + fd->type = V4L2_MBUS_FRAME_DESC_TYPE_PARALLEL; fd->num_entries = 1;