From 0dbe4770795fad712801674a06ba6a48660d3a10 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Sat, 21 Jul 2007 17:11:26 +0200 Subject: [PATCH] --- yaml --- r: 62439 b: refs/heads/master c: 48dd9343d0bb54362a2ba65380fea7c8f07f9e74 h: refs/heads/master i: 62437: e3a7a89386cff665d495077cbf37ed0cef478bb0 62435: 2d87f06e731cd03d0e444530e614c8ca97c9f1d2 62431: 8738b806c0dd1d22c34c128461522ffc67d56add v: v3 --- [refs] | 2 +- trunk/include/asm-i386/uaccess.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2a238e1f812e..04d41797cbe4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 267eb01a62b1190d0bf87b1ef3b0c9d21cdb2c57 +refs/heads/master: 48dd9343d0bb54362a2ba65380fea7c8f07f9e74 diff --git a/trunk/include/asm-i386/uaccess.h b/trunk/include/asm-i386/uaccess.h index e2aa5e0d0cc7..d2a4f7be9c2c 100644 --- a/trunk/include/asm-i386/uaccess.h +++ b/trunk/include/asm-i386/uaccess.h @@ -581,7 +581,7 @@ long __must_check __strncpy_from_user(char *dst, * If there is a limit on the length of a valid string, you may wish to * consider using strnlen_user() instead. */ -#define strlen_user(str) strnlen_user(str, ~0UL >> 1) +#define strlen_user(str) strnlen_user(str, LONG_MAX) long strnlen_user(const char __user *str, long n); unsigned long __must_check clear_user(void __user *mem, unsigned long len);