diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-18 16:11:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-18 16:11:32 -0400 |
| commit | c6cd850d6568872f66fc4a4582f34f9b910066ca (patch) | |
| tree | e9a6370f7b0ce110e2916a6288a8fb0ee8323e37 /arch/s390/lib/uaccess.c | |
| parent | 27902f08065ba61514c331b7d6e85635c1655d82 (diff) | |
| parent | 8b4822de59d5d9919b9b045183a36c673ce20b73 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/s390/lib/uaccess.c')
| -rw-r--r-- | arch/s390/lib/uaccess.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/lib/uaccess.c b/arch/s390/lib/uaccess.c index 1e5bb2b86c42..b3bd3f23b8e8 100644 --- a/arch/s390/lib/uaccess.c +++ b/arch/s390/lib/uaccess.c @@ -337,8 +337,8 @@ long __strncpy_from_user(char *dst, const char __user *src, long size) return 0; done = 0; do { - offset = (size_t)src & ~PAGE_MASK; - len = min(size - done, PAGE_SIZE - offset); + offset = (size_t)src & (L1_CACHE_BYTES - 1); + len = min(size - done, L1_CACHE_BYTES - offset); if (copy_from_user(dst, src, len)) return -EFAULT; len_str = strnlen(dst, len); |