Merge tag 'drm-next-2019-09-27' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / lib / strncpy_from_user.c

diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
index 023ba9f..dccb95a 100644 (file)
--- a/lib/strncpy_from_user.c
+++ b/lib/strncpy_from_user.c
@@ -6,6 +6,7 @@
 #include <linux/uaccess.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
+#include <linux/mm.h>
 
 #include <asm/byteorder.h>
 #include <asm/word-at-a-time.h>
@@ -108,7 +109,7 @@ long strncpy_from_user(char *dst, const char __user *src, long count)
                return 0;
 
        max_addr = user_addr_max();
-       src_addr = (unsigned long)src;
+       src_addr = (unsigned long)untagged_addr(src);
        if (likely(src_addr < max_addr)) {
                unsigned long max = max_addr - src_addr;
                long retval;