X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=mm%2Fmaccess.c;h=78f9274dd49d06f11f87beae9520a0e1267dc3ff;hb=efa59a01f75e4b1e1b870cbdbb4ffd5a0ab27caf;hp=d159b1c96e484d902f6edb34ebb5a83a3977bd57;hpb=f20780f3e8feec0eebcf9fb41e1d90202fffaeff;p=firefly-linux-kernel-4.4.55.git diff --git a/mm/maccess.c b/mm/maccess.c index d159b1c96e48..78f9274dd49d 100644 --- a/mm/maccess.c +++ b/mm/maccess.c @@ -96,8 +96,7 @@ long strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count) pagefault_disable(); do { - ret = __copy_from_user_inatomic(dst++, - (const void __user __force *)src++, 1); + ret = __get_user(*dst++, (const char __user __force *)src++); } while (dst[-1] && ret == 0 && src - unsafe_addr < count); dst[-1] = '\0';