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

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

diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
index 7f2db3f..28ff554 100644 (file)
--- a/lib/strnlen_user.c
+++ b/lib/strnlen_user.c
@@ -2,6 +2,7 @@
 #include <linux/kernel.h>
 #include <linux/export.h>
 #include <linux/uaccess.h>
+#include <linux/mm.h>
 
 #include <asm/word-at-a-time.h>
 
@@ -109,7 +110,7 @@ long strnlen_user(const char __user *str, long count)
                return 0;
 
        max_addr = user_addr_max();
-       src_addr = (unsigned long)str;
+       src_addr = (unsigned long)untagged_addr(str);
        if (likely(src_addr < max_addr)) {
                unsigned long max = max_addr - src_addr;
                long retval;