| Message ID | 20200114200846.29434-2-vgupta@synopsys.com |
|---|---|
| State | New |
| Headers | show |
| Series | Switching ARC to optimized generic strncpy_from_user | expand |
On Tue, Jan 14, 2020 at 9:08 PM Vineet Gupta <Vineet.Gupta1@synopsys.com> wrote: > > There are 2 generic varaints of strncpy_from_user() / strnlen_user() > (1). inline version in asm-generic/uaccess.h > (2). optimized word-at-a-time version in lib/* > > This patch disables #1 if #2 selected. This allows arches to continue > reusing asm-generic/uaccess.h for rest of code > > This came up when switching ARC to generic word-at-a-time interface > > Signed-off-by: Vineet Gupta <vgupta@synopsys.com> This looks like a useful change, but I think we can do even better: It seems that there are no callers of __strnlen_user or __strncpy_from_user in the kernel today, so these should not be defined either when the Kconfig symbols are set. Also, I would suggest moving the 'extern' declaration for the two functions into the #else branch of the conditional so it does not need to be duplicated. Arnd
On Tue, Jan 14, 2020 at 12:09 PM Vineet Gupta <Vineet.Gupta1@synopsys.com> wrote: > > There are 2 generic varaints of strncpy_from_user() / strnlen_user() > (1). inline version in asm-generic/uaccess.h I think we should get rid of this entirely. It's just a buggy garbage implementation that nobody should ever actually use. It does just about everything wrong that you *can* do, wrong, including doing the NUL-filling termination of standard strncpy() that "strncpy_from_user()" doesn't actually do. So: - the asm-generic/uaccess.h __strncpy_from_user() function is just horribly wrong - the generic/uaccess.h version of strncpy_from_user() shouldn't be an inline function either, since the only thing it can do inline is the bogus one-byte access check that _barely_ makes security work (you also need to have a guard page to _actually_ make it work, and I'm not atr all convinced that people do). the whole thing is just broken and should be removed from a header file. > (2). optimized word-at-a-time version in lib/* That is - outside of the original x86 strncpy_from_user() - the only copy of this function that historically gets all the corner cases right. And even those we've gotten wrong occasionally. I would suggest that anybody who uses asm-generic/uaccess.h needs to simply use the generic library version. Linus
On Tue, Jan 14, 2020 at 10:33 PM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Tue, Jan 14, 2020 at 12:09 PM Vineet Gupta > <Vineet.Gupta1@synopsys.com> wrote: > > > > There are 2 generic varaints of strncpy_from_user() / strnlen_user() > > (1). inline version in asm-generic/uaccess.h > > I think we should get rid of this entirely. It's just a buggy garbage > implementation that nobody should ever actually use. > > It does just about everything wrong that you *can* do, wrong, > including doing the NUL-filling termination of standard strncpy() that > "strncpy_from_user()" doesn't actually do. > > So: > > - the asm-generic/uaccess.h __strncpy_from_user() function is just > horribly wrong I checked who is actually using it, and the only ones I found are c6x and rv32-nommu. It shouldn't be hard to move them over to the generic version. > - the generic/uaccess.h version of strncpy_from_user() shouldn't be > an inline function either, since the only thing it can do inline is > the bogus one-byte access check that _barely_ makes security work (you > also need to have a guard page to _actually_ make it work, and I'm not > atr all convinced that people do). That would be arc, hexagon, unicore32, and um. Hexagon already has the same bug in strncpy_from_user and should be converted to the generic version as you say. For unicore32 the existing asm imlpementation may be fine, but it's clearly easier to use the generic code than moving the range check in there. I don't know what the arch/um implementation needs, but since it's in C, moving the access_ok() in there is easy enough. > I would suggest that anybody who uses asm-generic/uaccess.h needs to > simply use the generic library version. Or possibly just everybody altogether: the remaining architectures that have a custom implementation don't seem to be doing any better either. Arnd
On Wed, Jan 15, 2020 at 10:08:31AM +0100, Arnd Bergmann wrote: > > I would suggest that anybody who uses asm-generic/uaccess.h needs to > > simply use the generic library version. > > Or possibly just everybody altogether: the remaining architectures that > have a custom implementation don't seem to be doing any better either. No go for s390. There you really want to access userland memory in larger chunks - it's oriented for block transfers. IIRC, the insn they are using has a costly setup phase, independent of the amount to copy, followed by reasonably fast transfer more or less linear by the size.
On Wed, Jan 15, 2020 at 3:12 PM Al Viro <viro@zeniv.linux.org.uk> wrote: > > On Wed, Jan 15, 2020 at 10:08:31AM +0100, Arnd Bergmann wrote: > > > > I would suggest that anybody who uses asm-generic/uaccess.h needs to > > > simply use the generic library version. > > > > Or possibly just everybody altogether: the remaining architectures that > > have a custom implementation don't seem to be doing any better either. > > No go for s390. There you really want to access userland memory in > larger chunks - it's oriented for block transfers. IIRC, the insn > they are using has a costly setup phase, independent of the amount > to copy, followed by reasonably fast transfer more or less linear > by the size. Right, I missed that one while looking through the remaining implementations. Arnd
On 1/14/20 12:57 PM, Arnd Bergmann wrote: > On Tue, Jan 14, 2020 at 9:08 PM Vineet Gupta <Vineet.Gupta1@synopsys.com> wrote: >> There are 2 generic varaints of strncpy_from_user() / strnlen_user() >> (1). inline version in asm-generic/uaccess.h >> (2). optimized word-at-a-time version in lib/* >> >> This patch disables #1 if #2 selected. This allows arches to continue >> reusing asm-generic/uaccess.h for rest of code >> >> This came up when switching ARC to generic word-at-a-time interface >> >> Signed-off-by: Vineet Gupta <vgupta@synopsys.com> > This looks like a useful change, but I think we can do even better: It > seems that > there are no callers of __strnlen_user or __strncpy_from_user in the > kernel today, so these should not be defined either when the Kconfig symbols > are set. Also, I would suggest moving the 'extern' declaration for the two > functions into the #else branch of the conditional so it does not need to be > duplicated. Given where things seem to be heading, do u still want an updated patch for this or do u plan to ditch the inline version in short term anyways. -Vineet
On Thu, Jan 16, 2020 at 12:02 AM Vineet Gupta <Vineet.Gupta1@synopsys.com> wrote: > On 1/14/20 12:57 PM, Arnd Bergmann wrote: > > On Tue, Jan 14, 2020 at 9:08 PM Vineet Gupta <Vineet.Gupta1@synopsys.com> wrote: > >> There are 2 generic varaints of strncpy_from_user() / strnlen_user() > >> (1). inline version in asm-generic/uaccess.h > >> (2). optimized word-at-a-time version in lib/* > >> > >> This patch disables #1 if #2 selected. This allows arches to continue > >> reusing asm-generic/uaccess.h for rest of code > >> > >> This came up when switching ARC to generic word-at-a-time interface > >> > >> Signed-off-by: Vineet Gupta <vgupta@synopsys.com> > > This looks like a useful change, but I think we can do even better: It > > seems that > > there are no callers of __strnlen_user or __strncpy_from_user in the > > kernel today, so these should not be defined either when the Kconfig symbols > > are set. Also, I would suggest moving the 'extern' declaration for the two > > functions into the #else branch of the conditional so it does not need to be > > duplicated. > > Given where things seem to be heading, do u still want an updated patch for this > or do u plan to ditch the inline version in short term anyways. I'm trying to come up with a cleanup series now that I'll send you. You can base on top of that if you like. Arnd
diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h index e935318804f8..74c14211377b 100644 --- a/include/asm-generic/uaccess.h +++ b/include/asm-generic/uaccess.h @@ -227,6 +227,7 @@ __strncpy_from_user(char *dst, const char __user *src, long count) } #endif +#ifndef CONFIG_GENERIC_STRNCPY_FROM_USER static inline long strncpy_from_user(char *dst, const char __user *src, long count) { @@ -234,6 +235,7 @@ strncpy_from_user(char *dst, const char __user *src, long count) return -EFAULT; return __strncpy_from_user(dst, src, count); } +#endif /* * Return the size of a string (including the ending 0) @@ -244,6 +246,7 @@ strncpy_from_user(char *dst, const char __user *src, long count) #define __strnlen_user(s, n) (strnlen((s), (n)) + 1) #endif +#ifndef CONFIG_GENERIC_STRNLEN_USER /* * Unlike strnlen, strnlen_user includes the nul terminator in * its returned count. Callers should check for a returned value @@ -255,6 +258,7 @@ static inline long strnlen_user(const char __user *src, long n) return 0; return __strnlen_user(src, n); } +#endif /* * Zero Userspace
There are 2 generic varaints of strncpy_from_user() / strnlen_user() (1). inline version in asm-generic/uaccess.h (2). optimized word-at-a-time version in lib/* This patch disables #1 if #2 selected. This allows arches to continue reusing asm-generic/uaccess.h for rest of code This came up when switching ARC to generic word-at-a-time interface Signed-off-by: Vineet Gupta <vgupta@synopsys.com> --- include/asm-generic/uaccess.h | 4 ++++ 1 file changed, 4 insertions(+)