From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91C26C433F5 for ; Tue, 9 Nov 2021 01:09:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D3AD61B2D for ; Tue, 9 Nov 2021 01:09:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241962AbhKIBMB (ORCPT ); Mon, 8 Nov 2021 20:12:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:39746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242171AbhKIBJs (ORCPT ); Mon, 8 Nov 2021 20:09:48 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 54B8161A70; Tue, 9 Nov 2021 01:04:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636419862; bh=hCBZVbn5ACGsSoRa85leu+ceg8jHthpi32UI/d/3jZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vEoS73YZFbb9+gjznJxHDYjBOGz10H7t1kteHXECf45KFjXBx6/aQ0j3UUnDXK1t6 wjp2b6T8vQ0WmyTJNwZXgoh7VFB/PLqvrJbtrFi1vHVwy5Gafk1Gsgwyi046CUYLkh WOOycUN/IV0h2g6wqjU9PbdMZHfqqcywW0+7Zg5wIXWn3sNQIWvgofPSQJJ7dFPk21 IRPp8tw+9asA34D1H56QQOqouFLt0RbfKFA/tJM7QaZerKxvXNvYVFOyaV0Lncq4mG NdMYru0EkgflRh4Kve6/1r60yO//lrjPSenDN6/3vvwlCaMNEPLot8OsgrFdZS/sya SUeWkKpjNp7ig== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nadezda Lutovinova , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , a.hajda@samsung.com, mchehab@kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 035/101] media: s5p-mfc: Add checking to s5p_mfc_probe(). Date: Mon, 8 Nov 2021 12:47:25 -0500 Message-Id: <20211108174832.1189312-35-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211108174832.1189312-1-sashal@kernel.org> References: <20211108174832.1189312-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nadezda Lutovinova [ Upstream commit cdfaf4752e6915a4b455ad4400133e540e4dc965 ] If of_device_get_match_data() return NULL, then null pointer dereference occurs in s5p_mfc_init_pm(). The patch adds checking if dev->variant is NULL. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Nadezda Lutovinova Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index c763c0a03140c..f336a95432732 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1288,6 +1288,10 @@ static int s5p_mfc_probe(struct platform_device *pdev) } dev->variant = of_device_get_match_data(&pdev->dev); + if (!dev->variant) { + dev_err(&pdev->dev, "Failed to get device MFC hardware variant information\n"); + return -ENOENT; + } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); dev->regs_base = devm_ioremap_resource(&pdev->dev, res); -- 2.33.0