From patchwork Tue Mar 1 07:32:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ammar Faizi X-Patchwork-Id: 12764245 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8BACC433F5 for ; Tue, 1 Mar 2022 07:32:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231497AbiCAHdY (ORCPT ); Tue, 1 Mar 2022 02:33:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230129AbiCAHdY (ORCPT ); Tue, 1 Mar 2022 02:33:24 -0500 Received: from gnuweeb.org (gnuweeb.org [51.81.211.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FB7949C82; Mon, 28 Feb 2022 23:32:41 -0800 (PST) Received: from integral2.. (unknown [182.2.70.248]) by gnuweeb.org (Postfix) with ESMTPSA id 13F8F7ED80; Tue, 1 Mar 2022 07:32:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1646119961; bh=GB6eghckQTfJSVpeyTplikwA8110oYJx06BD07z+f2w=; h=From:To:Cc:Subject:Date:From; b=VvuZq4XXGRktsCBwjXWGcQvqyeu9nNVOFsSledC+nRAAh6K+jUtTBTEL8oRikLMzN baO5ohq0CGjMuwNJUDJDXiHiEOsfnBNX2PodTW4IxV4lC53hwx1+t/ASdO3s5yK1Ou saasOtScmxtbPNWxp+kvzGgDWCI2ENLSEP176FQUlTgfPe1xo/X8e3guZ9H1ve1pYI +WyKhcRoGLHegLA2T8R+c8ANNSn8w6o3CgQTQXrh9NQJdfL76OApi8jfQ16FH3o2VI aXh6VjQd1DZzG5Kjg6Y0Dqzf3iaM6OleteGd7B04/yW+9RuU/d3LEnvC51QBoJ43Kl iNhbLFDVEG68g== From: Ammar Faizi To: Borislav Petkov Cc: Dave Hansen , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , Tony Luck , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, gwml@vger.gnuweeb.org, x86@kernel.org, stable@vger.kernel.org, Ammar Faizi Subject: [PATCH 0/2] Two x86 fixes Date: Tue, 1 Mar 2022 14:32:21 +0700 Message-Id: <20220301073223.98236-1-ammarfaizi2@gnuweeb.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org Hi, Two fixes for x86 arch. [PATCH 1/2] x86/delay: Fix the wrong asm constraint in `delay_loop()` The asm constraint does not reflect that the asm statement can modify the value of @loops. But the asm statement in delay_loop() does change the @loops. If by any chance the compiler inlines this function, it may clobber random stuff (e.g. local variable, important temporary value in reg, etc.). Fortunately, delay_loop() is only called indirectly (so it can't inline), and then the register it clobbers is %rax (which is by the nature of the calling convention, it's a caller saved register), so it didn't yield any bug. ^ That shouldn't be an excuse for using the wrong constraint anyway. This changes "a" (as an input) to "+a" (as an input and output). [PATCH 2/2] x86/mce/amd: Fix memory leak when `threshold_create_bank()` fails. @bp is a local variable, calling mce_threshold_remove_device() when threshold_create_bank() fails will not free the @bp. Note that mce_threshold_remove_device() frees the @bp only if it's already stored in the @threshold_banks per-CPU variable. At that point, the @threshold_banks per-CPU variable is still NULL, so the mce_threshold_remove_device() will just be a no-op and the @bp is leaked. Fix this by calling kfree() and early returning when we fail. This bug is introduced by commit 6458de97fc15530b544 ("x86/mce/amd: Straighten CPU hotplug path") [1]. Link: https://lore.kernel.org/all/20200403161943.1458-6-bp@alien8.de [1] v2: - Fix wrong copy/paste. Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Tony Luck Signed-off-by: Ammar Faizi --- Ammar Faizi (2): x86/delay: Fix the wrong asm constraint in `delay_loop()` x86/mce/amd: Fix memory leak when `threshold_create_bank()` fails arch/x86/kernel/cpu/mce/amd.c | 9 ++++----- arch/x86/lib/delay.c | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) base-commit: 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3