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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 76B2EC433B4 for ; Wed, 21 Apr 2021 13:10:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3CF5C61457 for ; Wed, 21 Apr 2021 13:10:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241815AbhDUNLU (ORCPT ); Wed, 21 Apr 2021 09:11:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:49526 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241029AbhDUNIc (ORCPT ); Wed, 21 Apr 2021 09:08:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4156E61440; Wed, 21 Apr 2021 13:07:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619010470; bh=lDWl2VYoKuY8L8C0WtHDDHgFU8GkwzhpXhUwGs93DJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oYk3kjr448FvGaBX2cMsK+nDcQ/dS53bHn6+4APEKQdD5V5wGUDRTjIjp64szhPCn Twnb0CG9OUYTuxXqEpiWAw7TfM80HXKHkyK+rfBnYuvbYwYchX4mY2b6S9jag0bMDD OHPMEL8BukAuggs2fq7j9ajSNojUdeZVXt0DQGJI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Aditya Pakki , Thomas Gleixner , kjlu@umn.edu, Borislav Petkov , "H. Peter Anvin" , Kees Cook , Joe Perches , Nicolai Stange , Roland Dreier Subject: [PATCH 113/190] Revert "x86/hpet: Prevent potential NULL pointer dereference" Date: Wed, 21 Apr 2021 14:59:48 +0200 Message-Id: <20210421130105.1226686-114-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210421130105.1226686-1-gregkh@linuxfoundation.org> References: <20210421130105.1226686-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 2e84f116afca3719c9d0a1a78b47b48f75fd5724. Commits from @umn.edu addresses have been found to be submitted in "bad faith" to try to test the kernel community's ability to review "known malicious" changes. The result of these submissions can be found in a paper published at the 42nd IEEE Symposium on Security and Privacy entitled, "Open Source Insecurity: Stealthily Introducing Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University of Minnesota) and Kangjie Lu (University of Minnesota). Because of this, all submissions from this group must be reverted from the kernel tree and will need to be re-reviewed again to determine if they actually are a valid fix. Until that work is complete, remove this change to ensure that no problems are being introduced into the codebase. Cc: Aditya Pakki Cc: 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 Cc: https Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/hpet.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 08651a4e6aa0..0515a97bf6f5 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -930,8 +930,6 @@ int __init hpet_enable(void) return 0; hpet_set_mapping(); - if (!hpet_virt_address) - return 0; /* Validate that the config register is working */ if (!hpet_cfg_working()) -- 2.31.1