x86/asm: add __user on copy_user_handle_tail() pointers
PATCH 1/1 x86/asm: add __user on copy_user_handle_tail() pointers
The copy_user_handle_tail() clearly uses both from and to as pointers to user-space memory. This triggers sparse warning on using the calls to get and put to user-space. This can be fixed easily by changing the call to take __user annotated pointer.s
arch/x86/lib/usercopy_64.c:68:21: warning: incorrect type in argument 1 (different address spaces)arch/x86/lib/usercopy_64.c:68:21: expected void const volatile [noderef] <asn:1>*<noident>arch/x86/lib/usercopy_64.c:68:21: got char *arch/x86/lib/usercopy_64.c:70:21: warning: incorrect type in argument 1 (different address spaces)arch/x86/lib/usercopy_64.c:70:21: expected void const volatile [noderef] <asn:1>*<noident>arch/x86/lib/usercopy_64.c:70:21: got char *to
--- arch/x86/include/asm/uaccess_64.h | 2 +- arch/x86/lib/usercopy_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/uaccess_64.h +1 -1
@@ -208,7 +208,7 @@ __copy_from_user_flushcache(void *dst, const void __user *src, unsigned size) }unsigned long -copy_user_handle_tail (char *to,char *from,unsigned len); +copy_user_handle_tail (char __user *to,char __user *from,unsigned len);unsigned long mcsafe_handle_tail (char *to,char *from,unsigned len);
arch/x86/lib/usercopy_64.c +1 -1
@@ -60,7 +60,7 @@ EXPORT_SYMBOL(clear_user);* it is not necessary to optimize tail handling. */ __visible unsigned long -copy_user_handle_tail (char *to,char *from,unsigned len) +copy_user_handle_tail (char __user *to,char __user *from,unsigned len) {for (; len; --len, to++) {char c;
Signature · 1 line
2.20.1
Borislav Petkov
maintainerQuoted 4 lines · Ben Dooks
The
copy_user_handle_tail()clearly uses both from and to as pointers to user-space memory. This triggers sparse warning on using the calls to get and put to user-space. This can be fixed easily by changing the call to take__userannotated pointer.s
Well, but copy_user_generic() (which ends up calling the copy_user_handle_tail() eventually) casts those __user pointers to (__force void *). Converting them back to __user looks strange to me.
Linus?
Leaving in the rest for reference.
Quoted 42 lines
arch/x86/lib/usercopy_64.c:68:21: warning: incorrect type in argument 1 (different address spaces)arch/x86/lib/usercopy_64.c:68:21: expected void const volatile [noderef] <asn:1>*<noident>arch/x86/lib/usercopy_64.c:68:21: got char *arch/x86/lib/usercopy_64.c:70:21: warning: incorrect type in argument 1 (different address spaces)arch/x86/lib/usercopy_64.c:70:21: expected void const volatile [noderef] <asn:1>*<noident>arch/x86/lib/usercopy_64.c:70:21: got char *toSigned-off-by Ben Dooks <[email protected]>--- arch/x86/include/asm/uaccess_64.h | 2 +- arch/x86/lib/usercopy_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)arch/x86/include/asm/uaccess_64.h +1
-1@@ -208,7 +208,7 @@ __copy_from_user_flushcache(void *dst, const void __user *src, unsigned size) }unsigned long -copy_user_handle_tail (char *to,char *from,unsigned len); +copy_user_handle_tail (char __user *to,char __user *from,unsigned len);unsigned long mcsafe_handle_tail (char *to,char *from,unsigned len);arch/x86/lib/usercopy_64.c +1
-1@@ -60,7 +60,7 @@ EXPORT_SYMBOL(clear_user);* it is not necessary to optimize tail handling. */ __visible unsigned long -copy_user_handle_tail (char *to,char *from,unsigned len) +copy_user_handle_tail (char __user *to,char __user *from,unsigned len) {for (; len; --len, to++) {char c;Signature · 1 line
2.20.1
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Quoted 6 lines · Borislav Petkov
Well, but
copy_user_generic()(which ends up calling thecopy_user_handle_tail()eventually) casts those__userpointers to (__forcevoid *). Converting them back to__userlooks strange to me.Linus?
Well, it does that because the x86 version of copy_user_generic() can work in either direction, so it works when either the source or destination (or both) are user pointers, but they don't _have_ to be.
So the "userness" of a pointer in that context is a bit ambiguous, and so we've picked the pointers to be just plain "void *".
That said, arguably we should have gone the other way and just made them both "__user" pointers, and do the cast the other way around.
But there's no absolutely right answer here, and nobody should ever use copy_user_generic() directly (ie it is very much meant to be only used as a internal helper for the cases that get the pointer annotations right).
I do think Ben's patch is probably the right thing to do.
And we could do the same thing to copy_user_generic(), but that would require switching the casts around in the callers, so may not be worth the noise.
Linus
Borislav Petkov
maintainerQuoted 6 lines · Linus Torvalds
Well, it does that because the x86 version of
copy_user_generic()can work in either direction, so it works when either the source or destination (or both) are user pointers, but they don't _have_ to be.So the "userness" of a pointer in that context is a bit ambiguous, and so we've picked the pointers to be just plain "void *".
Yeah, I had a suspicion the reasoning would be something along those lines but couldn't find any threads discussing this quickly.
Quoted 8 lines
That said, arguably we should have gone the other way and just made them both "
__user" pointers, and do the cast the other way around.But there's no absolutely right answer here, and nobody should ever use
copy_user_generic()directly (ie it is very much meant to be only used as a internal helper for the cases that get the pointer annotations right).
Quoted 5 lines
I do think Ben's patch is probably the right thing to do.
And we could do the same thing to
copy_user_generic(), but that would require switching the casts around in the callers, so may not be worth the noise.
Ok, Ben can you please add Linus' reasoning for this to the commit message so that it is clear why it is done this way and we can find it with git archeology?
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.