From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0AB57E112; Wed, 21 Feb 2024 13:32:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708522359; cv=none; b=ZxxBoUNfhgdGVveHjsAPRqq615VmDSiCqT1C2NIN/MAe4IMwwmEk4I9uxj6AtIBJmpdSou7i0YeIJZ5RI74y1TrqP3R73F8PuGCtOgeQbKOhWezCuMRzWDKE/il0H7dfVcdfEH+jSInrtVLog+xM6JgBtPwZna3vRhmq11W5a3M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708522359; c=relaxed/simple; bh=VwfIdADSYB4KqqPZFXXKaPzmJYJdDJnYUsrZZ0htsh8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XqQC9Wlh4ASf5YwFx2aBhGEoHisXdMo/RmXF//KWOzWafbq33uVFsy2ISp40xEo7zvHeBh9jkYmXTzE3RIx1eryPbAIBWWrFF4o/Fntpz6rIQYpWc4qQV0cKi8AlrEZyb1e9rhXD1M1vsjyYVRnO+rlnX8FA/pFhTufCtVqrJ+M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SHYu+Pcw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SHYu+Pcw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF156C433F1; Wed, 21 Feb 2024 13:32:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708522359; bh=VwfIdADSYB4KqqPZFXXKaPzmJYJdDJnYUsrZZ0htsh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SHYu+PcwakrevtghTf2vloB+C1+oETSFXn9g67xbT0LjYW2jiK8g3RJ9meplLq1sE TS0w8a8JrI9kx+rHNIf8kkvkZyx/JbnreBWEP+aZRixvakd5amCVTWBrgGWpCBH63I y5ebOys13X+k9Z1Jxm9bdqBPMKVqG3ttXsCHU7l4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Prarit Bhargava , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.15 141/476] ACPI: extlog: fix NULL pointer dereference check Date: Wed, 21 Feb 2024 14:03:12 +0100 Message-ID: <20240221130013.143601251@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221130007.738356493@linuxfoundation.org> References: <20240221130007.738356493@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Prarit Bhargava [ Upstream commit 72d9b9747e78979510e9aafdd32eb99c7aa30dd1 ] The gcc plugin -fanalyzer [1] tries to detect various patterns of incorrect behaviour. The tool reports: drivers/acpi/acpi_extlog.c: In function ‘extlog_exit’: drivers/acpi/acpi_extlog.c:307:12: warning: check of ‘extlog_l1_addr’ for NULL after already dereferencing it [-Wanalyzer-deref-before-check] | | 306 | ((struct extlog_l1_head *)extlog_l1_addr)->flags &= ~FLAG_OS_OPTIN; | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ | | | | | (1) pointer ‘extlog_l1_addr’ is dereferenced here | 307 | if (extlog_l1_addr) | | ~ | | | | | (2) pointer ‘extlog_l1_addr’ is checked for NULL here but it was already dereferenced at (1) | Fix the NULL pointer dereference check in extlog_exit(). Link: https://gcc.gnu.org/onlinedocs/gcc-10.1.0/gcc/Static-Analyzer-Options.html # [1] Signed-off-by: Prarit Bhargava Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/acpi_extlog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c index 088db2356998..0a84d5afd37c 100644 --- a/drivers/acpi/acpi_extlog.c +++ b/drivers/acpi/acpi_extlog.c @@ -308,9 +308,10 @@ static int __init extlog_init(void) static void __exit extlog_exit(void) { mce_unregister_decode_chain(&extlog_mce_dec); - ((struct extlog_l1_head *)extlog_l1_addr)->flags &= ~FLAG_OS_OPTIN; - if (extlog_l1_addr) + if (extlog_l1_addr) { + ((struct extlog_l1_head *)extlog_l1_addr)->flags &= ~FLAG_OS_OPTIN; acpi_os_unmap_iomem(extlog_l1_addr, l1_size); + } if (elog_addr) acpi_os_unmap_iomem(elog_addr, elog_size); release_mem_region(elog_base, elog_size); -- 2.43.0