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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C932C7618F for ; Mon, 15 Jul 2019 14:50:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4ADC92067C for ; Mon, 15 Jul 2019 14:50:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563202229; bh=394QZhcBDh/8/E31jIj293uxy+K5rhXIyIdJ1VMo2n8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oTOGTG+P68v2dHIMPE/Ixh+AeyFkSDJn8vIlSsVSmWPrjGtsQ1qOsWwq+Sb/2Yw/U woorfGCxgeb5kVhBmGLs/8oUOfB16Z8x+pbXvCK1BMGrvcfEXRfDGNs8QgvxNrvNZM ZkT/IO2KLfTEemdcurCgkS/xw8ZJOtm/DDoOpeSI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404935AbfGOOqM (ORCPT ); Mon, 15 Jul 2019 10:46:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:35000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404813AbfGOOqH (ORCPT ); Mon, 15 Jul 2019 10:46:07 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B42062067C; Mon, 15 Jul 2019 14:46:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563201966; bh=394QZhcBDh/8/E31jIj293uxy+K5rhXIyIdJ1VMo2n8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NtP0JdQ87iGGqvD3r6evM4XGEu4WKThq5PuezIy2NyqvLjcJ2KjBy3Jj5WSfQS7vh uMoJGZVPx6XiB6PMrMBRk0fqC58JGV7EVoL/Ig+52qYTz6SMmZC5AMjsrkQQ6kwQfF XyAlOnX1tb9I8tL61yolfbqV0BK8n3/papxYFWmk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kangjie Lu , Mukesh Ojha , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 09/53] media: vpss: fix a potential NULL pointer dereference Date: Mon, 15 Jul 2019 10:44:51 -0400 Message-Id: <20190715144535.11636-9-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715144535.11636-1-sashal@kernel.org> References: <20190715144535.11636-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kangjie Lu [ Upstream commit e08f0761234def47961d3252eac09ccedfe4c6a0 ] In case ioremap fails, the fix returns -ENOMEM to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu Reviewed-by: Mukesh Ojha Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/davinci/vpss.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c index fce86f17dffc..c2c68988e38a 100644 --- a/drivers/media/platform/davinci/vpss.c +++ b/drivers/media/platform/davinci/vpss.c @@ -523,6 +523,11 @@ static int __init vpss_init(void) return -EBUSY; oper_cfg.vpss_regs_base2 = ioremap(VPSS_CLK_CTRL, 4); + if (unlikely(!oper_cfg.vpss_regs_base2)) { + release_mem_region(VPSS_CLK_CTRL, 4); + return -ENOMEM; + } + writel(VPSS_CLK_CTRL_VENCCLKEN | VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2); -- 2.20.1