Skip to content

Commit

Permalink
usercopy: Add parentheses around assignment in test_copy_struct_from_…
Browse files Browse the repository at this point in the history
…user

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: f5a1a53 ("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>
  • Loading branch information
Nathan Chancellor authored and Christian Brauner committed Oct 3, 2019
1 parent c2ba8f4 commit 3411158
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/test_user_copy.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ static int test_copy_struct_from_user(char *kmem, char __user *umem,
size_t ksize, usize;

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;

expected = kmalloc(size, GFP_KERNEL);
if (ret |= test(expected == NULL, "kmalloc failed"))
if ((ret |= test(expected == NULL, "kmalloc failed")))
goto out_free;

/* Fill umem with a fixed byte pattern. */
Expand Down

0 comments on commit 3411158

Please sign in to comment.