strndup_user, description
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest2 patches 2 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | strndup_user, convert (module)kernel/ | +3 | 0 replies | |
| 2/2 | strndup_user, convert (keyctl)security/ | +25 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATH 0/2] strndup_user, description
This patch series creates a strndup_user() function in order to avoid duplicated and error-prone (userspace modifying the string after the strlen_user()) code.
The diffstat:
include/linux/string.h | 3 + kernel/module.c | 19 +------- mm/util.c | 37 +++++++++++++++ security/keys/keyctl.c | 116 ++++++++++--------------------------------------- 4 files changed, 68 insertions(+), 107 deletions(-)
Signed-off-by Davi Arnaut <[email protected]>
--
include/linux/string.h +3 -0
@@ -18,6 +18,9 @@ extern char * strsep(char **,const charextern __kernel_size_t strspn (const char *,const char *);extern __kernel_size_t strcspn (const char *,const char *); +#define strdup_user (s) strndup_user(s, PAGE_SIZE) +extern char *strndup_user (const char __user *,long ); +/* * Include machine specific inline routines */
mm/util.c +37 -0
@@ -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.
@@ -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 =strlen_user (s); + +if (!length) +return ERR_PTR (-EFAULT ); + +if (length > n) + length = n; + + p =kmalloc (length,GFP_KERNEL ); + +if (!p) +return ERR_PTR (-ENOMEM ); + +if (strncpy_from_user (p, s, length) <0 ) { +kfree (p); +return ERR_PTR (-EFAULT ); + } + + p[length -1 ] ='\0' ; + +return p; +} +EXPORT_SYMBOL (strndup_user);