lkml.org 
[lkml]   [2023]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/bugs] x86/srso: Print actual mitigation if requested mitigation isn't possible
    The following commit has been merged into the x86/bugs branch of tip:

    Commit-ID: f9548addc12d02ee731ccd4a91ae55657e819d7d
    Gitweb: https://git.kernel.org/tip/f9548addc12d02ee731ccd4a91ae55657e819d7d
    Author: Josh Poimboeuf <jpoimboe@kernel.org>
    AuthorDate: Mon, 04 Sep 2023 22:04:50 -07:00
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitterDate: Sat, 23 Sep 2023 14:13:02 +02:00

    x86/srso: Print actual mitigation if requested mitigation isn't possible

    If the kernel wasn't compiled to support the requested option, print the
    actual option that ends up getting used.

    Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Reviewed-by: Borislav Petkov (AMD) <bp@alien8.de>
    Acked-by: Borislav Petkov (AMD) <bp@alien8.de>
    Link: https://lore.kernel.org/r/7e7a12ea9d85a9f76ca16a3efb71f262dee46ab1.1693889988.git.jpoimboe@kernel.org
    ---
    arch/x86/kernel/cpu/bugs.c | 3 ---
    1 file changed, 3 deletions(-)

    diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
    index 2859a54..235c0e0 100644
    --- a/arch/x86/kernel/cpu/bugs.c
    +++ b/arch/x86/kernel/cpu/bugs.c
    @@ -2461,7 +2461,6 @@ static void __init srso_select_mitigation(void)
    srso_mitigation = SRSO_MITIGATION_SAFE_RET;
    } else {
    pr_err("WARNING: kernel not compiled with CPU_SRSO.\n");
    - goto pred_cmd;
    }
    break;

    @@ -2473,7 +2472,6 @@ static void __init srso_select_mitigation(void)
    }
    } else {
    pr_err("WARNING: kernel not compiled with CPU_IBPB_ENTRY.\n");
    - goto pred_cmd;
    }
    break;

    @@ -2485,7 +2483,6 @@ static void __init srso_select_mitigation(void)
    }
    } else {
    pr_err("WARNING: kernel not compiled with CPU_SRSO.\n");
    - goto pred_cmd;
    }
    break;

    \
     
     \ /
      Last update: 2023-09-23 14:21    [W:9.529 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site