summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salter <msalter@redhat.com>2011-10-04 09:17:36 -0400
committerMark Salter <msalter@redhat.com>2011-10-06 19:47:12 -0400
commit830f5800acae17b972d264ab65fe54a7f10c1d82 (patch)
tree0d7807cced390c174f540aad7c8bf51c5c48a059
parent3ee72ca99288f1de95ec9c570e43f531c8799f06 (diff)
downloadop-kernel-dev-830f5800acae17b972d264ab65fe54a7f10c1d82.zip
op-kernel-dev-830f5800acae17b972d264ab65fe54a7f10c1d82.tar.gz
fix default __strnlen_user macro
The existing __strnlen_user macro simply resolved to strnlen. However, the count returned by strnlen_user should include the NULL byte. This patch fixes the __strnlen_user macro to include the NULL byte in the count. Signed-off-by: Mark Salter <msalter@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--include/asm-generic/uaccess.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
index ac68c99..9788568 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))
OpenPOWER on IntegriCloud