X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=include%2Fasm-generic%2Fuaccess.h;h=9788568f79782befb0be7cf29d148220f9c898c4;hb=a3f846f12ce75c62bde4b6a1332416520c4fc00a;hp=ac68c999b6c2165bbba9bea374505cbc60f5abf9;hpb=6288cf1e768ae73db5ddaaae54d85245cc1c2b56;p=cascardo%2Flinux.git

diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
index ac68c999b6c2..9788568f7978 100644
--- a/include/asm-generic/uaccess.h
+++ b/include/asm-generic/uaccess.h
@@ -289,9 +289,14 @@ strncpy_from_user(char *dst, const char __user *src, long count)
  * Return 0 on exception, a value greater than N if too long
  */
 #ifndef __strnlen_user
-#define __strnlen_user strnlen
+#define __strnlen_user(s, n) (strnlen((s), (n)) + 1)
 #endif
 
+/*
+ * Unlike strnlen, strnlen_user includes the nul terminator in
+ * its returned count. Callers should check for a returned value
+ * greater than N as an indication the string is too long.
+ */
 static inline long strnlen_user(const char __user *src, long n)
 {
 	if (!access_ok(VERIFY_READ, src, 1))