X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=lib%2Fstrncpy_from_user.c;h=58eacd41526c58339a7cb35ef92a618f0f3517e4;hb=594cc251fdd0d231d342d88b2fdff4bc42fb0690;hp=b53e1b5d80f429e611cd0be58e9ec1079fb68ead;hpb=51090c5d6de08cfc86b2d861775dedddd9a2c023;p=linux-2.6-microblaze.git

diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
index b53e1b5d80f4..58eacd41526c 100644
--- a/lib/strncpy_from_user.c
+++ b/lib/strncpy_from_user.c
@@ -114,10 +114,11 @@ long strncpy_from_user(char *dst, const char __user *src, long count)
 
 		kasan_check_write(dst, count);
 		check_object_size(dst, count, false);
-		user_access_begin();
-		retval = do_strncpy_from_user(dst, src, count, max);
-		user_access_end();
-		return retval;
+		if (user_access_begin(src, max)) {
+			retval = do_strncpy_from_user(dst, src, count, max);
+			user_access_end();
+			return retval;
+		}
 	}
 	return -EFAULT;
 }