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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 9C579C43381 for ; Sat, 30 Mar 2019 00:57:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6DC7021905 for ; Sat, 30 Mar 2019 00:57:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907447; bh=NIU0rUToEykEARWP+K8Vat0Z8o5USR8qA4eQRpbWeSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gF+rOXmPaN/xIDSpoU5YApPJMx/uXy8K+m8Le5kxRrbRHB1r3trE+HIBjmKcGKWgt Vzm4A1XJ9byuR2nWAjv4PUBN9/QYbCOznJy7XLw/hSqSqoc1kWooi7oQZtU1fQnTNO TSJwbiyc/wf8eR5R8CnZysBOYZ1F9bJH3TII3MWo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732112AbfC3A5Z (ORCPT ); Fri, 29 Mar 2019 20:57:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:37532 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732100AbfC3A5W (ORCPT ); Fri, 29 Mar 2019 20:57:22 -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 10AED2184C; Sat, 30 Mar 2019 00:57:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907442; bh=NIU0rUToEykEARWP+K8Vat0Z8o5USR8qA4eQRpbWeSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rx/E5CEGHfB0KvvPKzvsGlKNKuI0DlANsA9Kti+ZRhUn7duj/6YhBbzEEieLc9nWt vbKpv25bl16QeSW5zVbaT83PE1lFrOfoV2stqQggJwlBqPByU37aEB41QMlCl2er85 rnNYlH6BqtKZ8SUaDOmfJzxghtEkOdHtDghzoUDw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , Thomas Gleixner , kjlu@umn.edu, Borislav Petkov , "H. Peter Anvin" , Kees Cook , Joe Perches , Nicolai Stange , Roland Dreier , Sasha Levin Subject: [PATCH AUTOSEL 4.4 16/21] x86/hpet: Prevent potential NULL pointer dereference Date: Fri, 29 Mar 2019 20:56:44 -0400 Message-Id: <20190330005649.28475-16-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005649.28475-1-sashal@kernel.org> References: <20190330005649.28475-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: Aditya Pakki [ Upstream commit 2e84f116afca3719c9d0a1a78b47b48f75fd5724 ] hpet_virt_address may be NULL when ioremap_nocache fail, but the code lacks a check. Add a check to prevent NULL pointer dereference. Signed-off-by: Aditya Pakki Signed-off-by: Thomas Gleixner Cc: kjlu@umn.edu Cc: Borislav Petkov Cc: "H. Peter Anvin" Cc: Kees Cook Cc: Joe Perches Cc: Nicolai Stange Cc: Roland Dreier Link: https://lkml.kernel.org/r/20190319021958.17275-1-pakki001@umn.edu Signed-off-by: Sasha Levin --- arch/x86/kernel/hpet.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 3fdc1e53aaac..9cce5504a5c7 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -825,6 +825,8 @@ int __init hpet_enable(void) return 0; hpet_set_mapping(); + if (!hpet_virt_address) + return 0; /* * Read the period and check for a sane value: -- 2.19.1