1 files changed, 3 insertions, 4 deletions

diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
index 2625943625d7..8e105ed4df12 100644
--- a/lib/strnlen_user.c
+++ b/lib/strnlen_user.c
@@ -45,8 +45,7 @@ static inline long do_strnlen_user(const char __user *src, unsigned long count,
         src -= align;
         max += align;
 
-        if (unlikely(unsafe_get_user(c,(unsigned long __user *)src)))
-                return 0;
+        unsafe_get_user(c, (unsigned long __user *)src, efault);
         c |= aligned_byte_mask(align);
 
         for (;;) {
@@ -61,8 +60,7 @@ static inline long do_strnlen_user(const char __user *src, unsigned long count,
                 if (unlikely(max <= sizeof(unsigned long)))
                         break;
                 max -= sizeof(unsigned long);
-                if (unlikely(unsafe_get_user(c,(unsigned long __user *)(src+res))))
-                        return 0;
+                unsafe_get_user(c, (unsigned long __user *)(src+res), efault);
         }
         res -= align;
 
@@ -77,6 +75,7 @@ static inline long do_strnlen_user(const char __user *src, unsigned long count,
          * Nope: we hit the address space limit, and we still had more
          * characters the caller would have wanted. That's 0.
          */
+efault:
         return 0;
 }