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 0B4C4C43381 for ; Sat, 30 Mar 2019 00:58:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE9B92064A for ; Sat, 30 Mar 2019 00:58:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907498; bh=rzjyfQEpFv4H7gSD6jzBTtPDAWEjwXIrIHIBEONb1TI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XyoN6AXcobkvtYP/Y3z3FHLcJvmfnewH6n3TwWEv8+5P8qSyRa7MwqNKlpg884uVv 1Tbr0ZnXs8wXbPEKvSkTcgnp2PyDyrxYMEl9tkyJnNtZf6FEzv1YrvDe++4BsMVlmG 2Atr/mazqZObY2ZbRn6ChpgwtBSfg0XxWdAU24TA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731940AbfC3A6R (ORCPT ); Fri, 29 Mar 2019 20:58:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:38476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730880AbfC3A5z (ORCPT ); Fri, 29 Mar 2019 20:57:55 -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 7DE82218D3; Sat, 30 Mar 2019 00:57:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907474; bh=rzjyfQEpFv4H7gSD6jzBTtPDAWEjwXIrIHIBEONb1TI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gjwTOFz98KnUww/qbXqjl1s73RmqSmdgnuT1Y9uiuziN8mi8773XO0FDKwSQZ1zlu ACuJH/NOrd4sEwGiQXnMIIIaW3KtijKRsgtPpK14gV3XO0Y3ytqy4QtQXP9/8jivjy ZHRE7Yh5/SXVIdZJKF5nZJYK87a7b0ehMen7nAlc= 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 3.18 12/15] x86/hpet: Prevent potential NULL pointer dereference Date: Fri, 29 Mar 2019 20:57:27 -0400 Message-Id: <20190330005730.28777-12-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005730.28777-1-sashal@kernel.org> References: <20190330005730.28777-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 319bcb9372fe..3e9c5725732f 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -799,6 +799,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