From 9227c426373e2503f67e45d154c8a59507b90a16 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 17 Oct 2012 16:28:02 +0200 Subject: [PATCH] --- yaml --- r: 346850 b: refs/heads/master c: d95dcaa06ba895ec379d80b35c25ddba3a71943a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/uaccess.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5dd8b97fa00c..cca7d0648e80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9dfcdbd76b14a24e751d6e0bfb29dc262c69b0c +refs/heads/master: d95dcaa06ba895ec379d80b35c25ddba3a71943a diff --git a/trunk/arch/blackfin/include/asm/uaccess.h b/trunk/arch/blackfin/include/asm/uaccess.h index 5cc111502822..3edb4afa3053 100644 --- a/trunk/arch/blackfin/include/asm/uaccess.h +++ b/trunk/arch/blackfin/include/asm/uaccess.h @@ -216,12 +216,12 @@ copy_to_user(void __user *to, const void *from, unsigned long n) */ static inline long __must_check -strncpy_from_user(char *dst, const char *src, long count) +strncpy_from_user(char *dst, const char __user *src, long count) { char *tmp; if (!access_ok(VERIFY_READ, src, 1)) return -EFAULT; - strncpy(dst, src, count); + strncpy(dst, (const char __force *)src, count); for (tmp = dst; *tmp && count > 0; tmp++, count--) ; return (tmp - dst); }