Skip to content

Commit

Permalink
microblaze: uaccess: Fix strncpy_from_user function
Browse files Browse the repository at this point in the history
Generic implementation for noMMU and MMU version

Signed-off-by: Michal Simek <monstr@monstr.eu>
  • Loading branch information
Michal Simek committed Apr 1, 2010
1 parent 4270690 commit 40e11e3
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions arch/microblaze/include/asm/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -407,11 +407,19 @@ static inline long copy_to_user(void __user *to,
}

extern int __strncpy_user(char *to, const char __user *from, int len);

#define __strncpy_from_user __strncpy_user

static inline long
strncpy_from_user(char *dst, const char __user *src, long count)
{
if (!access_ok(VERIFY_READ, src, 1))
return -EFAULT;
return __strncpy_from_user(dst, src, count);
}

extern int __strnlen_user(const char __user *sstr, int len);

#define strncpy_from_user(to, from, len) \
(access_ok(VERIFY_READ, from, 1) ? \
__strncpy_user(to, from, len) : -EFAULT)
#define strnlen_user(str, len) \
(access_ok(VERIFY_READ, str, 1) ? __strnlen_user(str, len) : 0)

Expand Down

0 comments on commit 40e11e3

Please sign in to comment.