lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 113/170] powerpc/uaccess: fix warning/error with access_ok()
    Date
    From: Christophe Leroy <christophe.leroy@c-s.fr>

    [ Upstream commit 05a4ab823983d9136a460b7b5e0d49ee709a6f86 ]

    With the following piece of code, the following compilation warning
    is encountered:

    if (_IOC_DIR(ioc) != _IOC_NONE) {
    int verify = _IOC_DIR(ioc) & _IOC_READ ? VERIFY_WRITE : VERIFY_READ;

    if (!access_ok(verify, ioarg, _IOC_SIZE(ioc))) {

    drivers/platform/test/dev.c: In function 'my_ioctl':
    drivers/platform/test/dev.c:219:7: warning: unused variable 'verify' [-Wunused-variable]
    int verify = _IOC_DIR(ioc) & _IOC_READ ? VERIFY_WRITE : VERIFY_READ;

    This patch fixes it by referencing 'type' in the macro allthough
    doing nothing with it.

    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/include/asm/uaccess.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
    index 565cead12be2..cf26e62b268d 100644
    --- a/arch/powerpc/include/asm/uaccess.h
    +++ b/arch/powerpc/include/asm/uaccess.h
    @@ -54,7 +54,7 @@
    #endif

    #define access_ok(type, addr, size) \
    - (__chk_user_ptr(addr), \
    + (__chk_user_ptr(addr), (void)(type), \
    __access_ok((__force unsigned long)(addr), (size), get_fs()))

    /*
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 17:59    [W:4.900 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site