luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usercopy: Add parentheses around assignment in test_copy_struct_from_user

Browse Source 
Clang warns:

lib/test_user_copy.c:96:10: warning: using the result of an assignment
as a condition without parentheses [-Wparentheses]
        if (ret |= test(umem_src == NULL, "kmalloc failed"))
            ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
lib/test_user_copy.c:96:10: note: place parentheses around the
assignment to silence this warning
        if (ret |= test(umem_src == NULL, "kmalloc failed"))
                ^
            (                                              )
lib/test_user_copy.c:96:10: note: use '!=' to turn this compound
assignment into an inequality comparison
        if (ret |= test(umem_src == NULL, "kmalloc failed"))
                ^~
                !=

Add the parentheses as it suggests because this is intentional.

Fixes: f5a1a536fa ("lib: introduce copy_struct_from_user() helper")
Link: https://github.com/ClangBuiltLinux/linux/issues/731
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Acked-by: Aleksa Sarai <cyphar@cyphar.com>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Link: https://lore.kernel.org/r/20191003171121.2723619-1-natechancellor@gmail.com
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Nathan Chancellor 2019-10-03 10:11:21 -07:00 committed by Christian Brauner
parent c2ba8f41ad
commit 341115822f
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/test_user_copy.c
View File

@ -93,11 +93,11 @@ static int test_copy_struct_from_user(char *kmem, char __user *umem,
size_t ksize, usize; size_t ksize, usize;
umem_src = kmalloc(size, GFP_KERNEL); umem_src = kmalloc(size, GFP_KERNEL);
if (ret |= test(umem_src == NULL, "kmalloc failed")) if ((ret |= test(umem_src == NULL, "kmalloc failed")))
goto out_free; goto out_free;
expected = kmalloc(size, GFP_KERNEL); expected = kmalloc(size, GFP_KERNEL);
if (ret |= test(expected == NULL, "kmalloc failed")) if ((ret |= test(expected == NULL, "kmalloc failed")))
goto out_free; goto out_free;
/* Fill umem with a fixed byte pattern. */ /* Fill umem with a fixed byte pattern. */