lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0267/1039] x86/uaccess: Move variable into switch case statement
    Date
    From: Kees Cook <keescook@chromium.org>

    [ Upstream commit 61646ca83d3889696f2772edaff122dd96a2935e ]

    When building with automatic stack variable initialization, GCC 12
    complains about variables defined outside of switch case statements.
    Move the variable into the case that uses it, which silences the warning:

    ./arch/x86/include/asm/uaccess.h:317:23: warning: statement will never be executed [-Wswitch-unreachable]
    317 | unsigned char x_u8__; \
    | ^~~~~~

    Fixes: 865c50e1d279 ("x86/uaccess: utilize CONFIG_CC_HAS_ASM_GOTO_OUTPUT")
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lkml.kernel.org/r/20211209043456.1377875-1-keescook@chromium.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/include/asm/uaccess.h | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
    index 33a68407def3f..8ab9e79abb2b4 100644
    --- a/arch/x86/include/asm/uaccess.h
    +++ b/arch/x86/include/asm/uaccess.h
    @@ -314,11 +314,12 @@ do { \
    do { \
    __chk_user_ptr(ptr); \
    switch (size) { \
    - unsigned char x_u8__; \
    - case 1: \
    + case 1: { \
    + unsigned char x_u8__; \
    __get_user_asm(x_u8__, ptr, "b", "=q", label); \
    (x) = x_u8__; \
    break; \
    + } \
    case 2: \
    __get_user_asm(x, ptr, "w", "=r", label); \
    break; \
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:11    [W:2.537 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site