Skip to content

Commit

Permalink
[PATCH] strndup_user()
Browse files Browse the repository at this point in the history
This patch series creates a strndup_user() function to easy copying C strings
from userspace.  Also we avoid common pitfalls like userspace modifying the
final \0 after the strlen_user().

Signed-off-by: Davi Arnaut <davi.arnaut@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
darnaut authored and Linus Torvalds committed Mar 24, 2006
1 parent 6687a97 commit 96840aa
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
2 changes: 2 additions & 0 deletions include/linux/string.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ extern char * strsep(char **,const char *);
extern __kernel_size_t strspn(const char *,const char *);
extern __kernel_size_t strcspn(const char *,const char *);

extern char *strndup_user(const char __user *, long);

/*
* Include machine specific inline routines
*/
Expand Down
37 changes: 37 additions & 0 deletions mm/util.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/module.h>
#include <linux/err.h>
#include <asm/uaccess.h>

/**
* kzalloc - allocate memory. The memory is set to zero.
Expand Down Expand Up @@ -37,3 +39,38 @@ char *kstrdup(const char *s, gfp_t gfp)
return buf;
}
EXPORT_SYMBOL(kstrdup);

/*
* strndup_user - duplicate an existing string from user space
*
* @s: The string to duplicate
* @n: Maximum number of bytes to copy, including the trailing NUL.
*/
char *strndup_user(const char __user *s, long n)
{
char *p;
long length;

length = strnlen_user(s, n);

if (!length)
return ERR_PTR(-EFAULT);

if (length > n)
return ERR_PTR(-EINVAL);

p = kmalloc(length, GFP_KERNEL);

if (!p)
return ERR_PTR(-ENOMEM);

if (copy_from_user(p, s, length)) {
kfree(p);
return ERR_PTR(-EFAULT);
}

p[length - 1] = '\0';

return p;
}
EXPORT_SYMBOL(strndup_user);

0 comments on commit 96840aa

Please sign in to comment.