Received: by 2002:ac0:aed5:0:0:0:0:0 with SMTP id t21csp6548886imb; Fri, 8 Mar 2019 22:56:22 -0800 (PST) X-Google-Smtp-Source: APXvYqz3dNygzYKlKrE8aLqI8K0nsOlzoulrdw5hTiakbhxDSFOcxljHcX365ZZyk54Ii3N0r5t+ X-Received: by 2002:aa7:8243:: with SMTP id e3mr23000601pfn.40.1552114582675; Fri, 08 Mar 2019 22:56:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1552114582; cv=none; d=google.com; s=arc-20160816; b=lfQKeOKEx2CnUBg9JMfR3qZqcnth+Uh9qm9FuovGnCaYKoddx0BlBbgX6b/+UXCDnp KMb9IV8QLE0bKWp9E2tUfuaZsmO/qvDFxXmw8j0ISPyLiZnDi+6pU3hj2mEAzM4ujyPw try5cLhmevAK37vvqrDNP/1qjZvFBg8WhpHh98MK7Guprw703e60MHBeXzWr8uQwwwa+ i+ffqx5ukmtcgJLCrOGaIL+p4Kv857VkdMMSuSUyHdtLnrEaew3Q7Q0sEI8jGk9cZkiW W2+tsWB+FIt9M2ZxgkfOXdxyL0u9ArKBsrmrDiOsX+NPok0U1InyInjt7UgSZL1PddnD i9ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=aAv+hI3CTtwulK+l6wXTIO0OnOf4JZJ3xxrlW8iLX+I=; b=FJ8syOd8AKMTtXySoP1HOwxcPg3u5TOjg2F8dtf8iVjzwhk5n5SJODDBEvAkgVqnu2 ZWt4+Ar6Ry5kB4KTTxwcE0n8DsrGOEPqzbO0m6smLnd5eOnj9947S/kUkicz/xSRSPMY BsCHpPc6dcuk3CWVwDbXItdTyEd+M7u8N7NDGXxmK58+q5Ggs6m6N9G9JL5gYr/hjli4 PAJwtwiXXmxvngPmiX6OlBLVnR5LA/F0R8nhZs+fIeloPtHytFCMyyaSH8efmnbxvnYn xLpax0Ou6O635f22iJ14Tl+rrw9DIOpvkzPKvggduOtE65RRaiLHVRTuuse7dBISRyW2 zoQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=DzuXXNOv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k127si8589784pgc.124.2019.03.08.22.56.06; Fri, 08 Mar 2019 22:56:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=DzuXXNOv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726648AbfCIGz0 (ORCPT + 99 others); Sat, 9 Mar 2019 01:55:26 -0500 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:36690 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725987AbfCIGz0 (ORCPT ); Sat, 9 Mar 2019 01:55:26 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id CEBBAD3D for ; Sat, 9 Mar 2019 06:55:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id btI4JMHjc8uJ for ; Sat, 9 Mar 2019 00:55:24 -0600 (CST) Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 9DFAFD2E for ; Sat, 9 Mar 2019 00:55:24 -0600 (CST) Received: by mail-io1-f72.google.com with SMTP id m15so17205065ioc.16 for ; Fri, 08 Mar 2019 22:55:24 -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; bh=aAv+hI3CTtwulK+l6wXTIO0OnOf4JZJ3xxrlW8iLX+I=; b=DzuXXNOvH4UJyDPnXJbiDRg6j4+qjVDgDEfeb0xGF7u6MWdGtJo1WH9jRZaWTbDC/b HEj2J4jiOFD+sOIforVG9A6ycz/ZwCTuXFKL+V/397KhokAxJU0CCbKOzTerNFqlkOAf EyU+wdkJmkz/0rYcw3u0ma3Dp6yYNA2fb1h4xd009md2T8rBrLxCD5swuOZyjsEhcRMT kRF3cxe7A3KEGshdau/Ik8VhKSgLYQcXcnIOrI1HYyhi4QXjNfr24k2L8LGOmITOFXRW 3Kuw8ZquhOdBxLS9rKAbVkh2wJ1N+BkDev2RhO6BdS5+84oHweh64Qv0C75T35u4Ll/m Esyw== 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; bh=aAv+hI3CTtwulK+l6wXTIO0OnOf4JZJ3xxrlW8iLX+I=; b=orDAqykSjCHDKaoeJJ2GJnmnuMVQVzGt+a2113JgDtmf2ktjYNuGbT6BpJviVm07GA npE3Q3UUQC7Bdw7/eOZ6aHbbIyRqqRRTrSPtIrUPjnKnF3s8u765koqBQKxq654Ih9Tk h9N+nXreoQtFyi6oiztDVVRhQAOjJk9C6LDc/qx2VyOKuvvBJGKBRKFl94PeST6tBbf5 QTUlBCs1oRc9Jm9bYZL9Yo4GOij2IHZpJ1SzLzE7bY5lv7NRLGQ9N2vKMXt3JtLVlQ1B 5aMjtNTeK0FW97dh6wTS8e62SSiNTOyhSwzRTU2jMUlo6Bb3vcHbRdwJqy7pTzKRgZ0R 5XPw== X-Gm-Message-State: APjAAAVaIlhcFxVR7irWG7mriy8xfbsdb8UeRQ7Z9L/wtSTweTQN3ZCC 8o0dWrQpI5CcdDX9Mm22hICaAhnvHP74fmI34sO9JNrLSsRfuNpfneJwpNQX5EJ9UpQif8tzVhF FsZPOrrabjQc8bnf9GOtkmeTomlmn X-Received: by 2002:a02:3d1:: with SMTP id e78mr13326086jae.6.1552114524215; Fri, 08 Mar 2019 22:55:24 -0800 (PST) X-Received: by 2002:a02:3d1:: with SMTP id e78mr13326075jae.6.1552114523946; Fri, 08 Mar 2019 22:55:23 -0800 (PST) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id 127sm5058724itl.25.2019.03.08.22.55.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 22:55:23 -0800 (PST) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, "Lad, Prabhakar" , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: vpss: fix a potential NULL pointer dereference Date: Sat, 9 Mar 2019 00:53:51 -0600 Message-Id: <20190309065351.1184-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In case ioremap fails, the fix returns -ENOMEM to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu --- drivers/media/platform/davinci/vpss.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c index 19cf6853411e..f7beed2de9cb 100644 --- a/drivers/media/platform/davinci/vpss.c +++ b/drivers/media/platform/davinci/vpss.c @@ -518,6 +518,9 @@ 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)) + return -ENOMEM; + writel(VPSS_CLK_CTRL_VENCCLKEN | VPSS_CLK_CTRL_DACCLKEN, oper_cfg.vpss_regs_base2); -- 2.17.1