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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,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 2AE89C28CC1 for ; Sat, 1 Jun 2019 13:27:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE29824937 for ; Sat, 1 Jun 2019 13:27:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395650; bh=uMYJg1J7W9gwIf64iWYDIHriKB8nkrDVCNLE422qyQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1wgZF+Wsa9NJQTout+rkPsPuP0yXG6nMx8WE3ljAFHRhddvHcTgBkRHoetjrwzofp x0GCe+GlBUWg8a2qgT8DAEhv1haqODUGNsvxV1BxVnghxhVcC8Z0HFP5rE/aRtV2ZR +p1OOneRUA1aYw8LY3STYtPoHRuqqB4ioBzP1WvQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729654AbfFAN13 (ORCPT ); Sat, 1 Jun 2019 09:27:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:57990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729930AbfFAN1R (ORCPT ); Sat, 1 Jun 2019 09:27:17 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.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 3F328273D5; Sat, 1 Jun 2019 13:27:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395637; bh=uMYJg1J7W9gwIf64iWYDIHriKB8nkrDVCNLE422qyQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sA1BINLWC5nCjw09TbLN16v6fde2008w3xfj7tv3hdYsYKu1Q5lIusd2kSEEG2StC 1Pjw5/boq9cQJJw0x6j3fV9jbMttPn4SVpguYexb7ElcPJSCeMo6zhXH23u1NBAwEt SGaXysSvCXoaEvy6n2F7Jf4ZQI7an0TmqtUw7Iig= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kangjie Lu , Aditya Pakki , Finn Thain , Rob Herring , Greg Kroah-Hartman , Bartlomiej Zolnierkiewicz , Sasha Levin , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.4 44/56] video: imsttfb: fix potential NULL pointer dereferences Date: Sat, 1 Jun 2019 09:25:48 -0400 Message-Id: <20190601132600.27427-44-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190601132600.27427-1-sashal@kernel.org> References: <20190601132600.27427-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 1d84353d205a953e2381044953b7fa31c8c9702d ] In case ioremap fails, the fix releases resources and returns -ENOMEM to avoid NULL pointer dereferences. Signed-off-by: Kangjie Lu Cc: Aditya Pakki Cc: Finn Thain Cc: Rob Herring Cc: Greg Kroah-Hartman [b.zolnierkie: minor patch summary fixup] Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/imsttfb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c index 9b167f7ef6c69..4994a540f6809 100644 --- a/drivers/video/fbdev/imsttfb.c +++ b/drivers/video/fbdev/imsttfb.c @@ -1517,6 +1517,11 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) info->fix.smem_start = addr; info->screen_base = (__u8 *)ioremap(addr, par->ramdac == IBM ? 0x400000 : 0x800000); + if (!info->screen_base) { + release_mem_region(addr, size); + framebuffer_release(info); + return -ENOMEM; + } info->fix.mmio_start = addr + 0x800000; par->dc_regs = ioremap(addr + 0x800000, 0x1000); par->cmap_regs_phys = addr + 0x840000; -- 2.20.1