summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Chancellor <natechancellor@gmail.com>2019-10-03 20:11:21 +0300
committerChristian Brauner <christian.brauner@ubuntu.com>2019-10-03 22:13:27 +0300
commit341115822f8832f0c2d8af2f7e151c4c9a77bcd1 (patch)
treebb30a7babcf846bf5e7c03b1f5c7ac9a85743262
parentc2ba8f41ad366dc12840dd87d8f1565185845126 (diff)
downloadlinux-341115822f8832f0c2d8af2f7e151c4c9a77bcd1.tar.xz
usercopy: Add parentheses around assignment in test_copy_struct_from_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: f5a1a536fa14 ("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>
-rw-r--r--lib/test_user_copy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/test_user_copy.c b/lib/test_user_copy.c
index 950ee88cd6ac..e365ace06538 100644
--- a/lib/test_user_copy.c
+++ b/lib/test_user_copy.c
@@ -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. */