2019-10-03 17:13:35

by Nathan Chancellor

[permalink] [raw]
Subject: [PATCH] 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 <[email protected]>
---
lib/test_user_copy.c | 4 ++--
1 file 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. */
--
2.23.0


2019-10-03 18:13:12

by Aleksa Sarai

[permalink] [raw]
Subject: Re: [PATCH] usercopy: Add parentheses around assignment in test_copy_struct_from_user

On 2019-10-03, Christian Brauner <[email protected]> wrote:
> On Thu, Oct 3, 2019, 19:11 Nathan Chancellor <[email protected]>
> wrote:
>
> > 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 <[email protected]>
> >
>
> I'll take this. Aleksa, can I get your ack too, please?
>
> Acked-by: Christian Brauner <[email protected]>

Acked-by: Aleksa Sarai <[email protected]>


--
Aleksa Sarai
Senior Software Engineer (Containers)
SUSE Linux GmbH
<https://www.cyphar.com/>


Attachments:
(No filename) (1.46 kB)
signature.asc (235.00 B)
Download all attachments

2019-10-03 19:16:53

by Christian Brauner

[permalink] [raw]
Subject: Re: [PATCH] usercopy: Add parentheses around assignment in test_copy_struct_from_user

On Thu, Oct 03, 2019 at 10:11:21AM -0700, Nathan Chancellor wrote:
> 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 <[email protected]>

Applied to:
https://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git/log/?h=copy_struct_from_user

Thanks!
Christian