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 0DA01C4332F for ; Tue, 9 Nov 2021 01:13:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E993F61353 for ; Tue, 9 Nov 2021 01:13:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241322AbhKIBQb (ORCPT ); Mon, 8 Nov 2021 20:16:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:40814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242866AbhKIBO1 (ORCPT ); Mon, 8 Nov 2021 20:14:27 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id CDBD261ACF; Tue, 9 Nov 2021 01:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636419949; bh=fGFQjNNUdNrz52vfi3x9I5L+GYEXW1Vh5yiXJ8d4EGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HgZlGXOBfFkIqmXWXPG6A6G9XvF8fBIxQSvuV6Od8LQFny3dO+q2i+B5I0dFXs61L 6vrc80muSSGturxPE8J5oDGs/G5VHtyyhwK+gBYm+v2rrECXWkzqwwyL3d3JjtPfqy 4781L3N/iB06WbgDsd+n9FHlYDOik2DQPIjKcE2VjMjHlTltxCR7OlaxRo0vYD0IX0 /I5BPMUq8nM58bHcPHk6WBYaRBQYqETCwwtaYLA5UTmdESkg7FxSpmyN2M3yChDPiB JBAEaE95YGtb8nqA8vSKNRNtMXP7+aG1R6JDwWUT25XWhLTC1+qhIUSoUdHdbs8YyV kiTpA0Z++sHpA== 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 4.19 19/47] media: s5p-mfc: Add checking to s5p_mfc_probe(). Date: Mon, 8 Nov 2021 12:50:03 -0500 Message-Id: <20211108175031.1190422-19-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211108175031.1190422-1-sashal@kernel.org> References: <20211108175031.1190422-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 80bb58d31c3f6..0fc101bc58d67 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1281,6 +1281,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