Skip to contentSkip to conversation

strndup_user, v2

PATCH In review Davi Arnaut 3 participants 5 messages Feb 15, 2006 – Feb 16, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover strndup_user, v2

Hi,

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.

v2: Inline strdup_user and fixed a bogus strdup_user usage.

The diffstat:

 include/linux/string.h |    7 ++
 kernel/module.c        |   19 +-------
 mm/util.c              |   37 +++++++++++++++
 security/keys/keyctl.c |  116 ++++++++++---------------------------------------
 4 files changed, 72 insertions(+), 107 deletions(-)

--

include/linux/string.h +7 -0
index 369be32..8fbf139 100644
@@ -18,6 +18,13 @@ 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);
+
+static inline char *strdup_user(const char __user *s)
+{
+	return strndup_user(s, 4096);
+}
+
 /*
  * Include machine specific inline routines
  */
mm/util.c +37 -0
index 5f4bb59..09c2c3b 100644
@@ -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);
#1 lore raw

include/linux/string.h extern char * strsep(char **,const char · line 26

Quoted 4 lines · Davi Arnaut
include/linux/string.h +4 -0
+static inline char *strdup_user(const char __user *s)
+{
+	return strndup_user(s, 4096);
+}

Still shouldn't exist. Its just a bad idea to give people broken function they don't yet use.

mm/util.c char *kstrdup(const char *s, gfp_t gfp) · line 54

Quoted 1 line
mm/util.c +1 -0
+	length = strlen_user(s);

Should use strnlen_user or this function is useless for most cases.

mm/util.c char *kstrdup(const char *s, gfp_t gfp) · line 57

Quoted 3 lines
mm/util.c +3 -0
+
+	if (!length)
+		return ERR_PTR(-EFAULT);

Zero isn't an -EFAULT length. Its a null string and valid

Quoted 5 lines
mm/util.c +5 -0
+
+	if (length > n)
+		length = n;
+
+	p = kmalloc(length, GFP_KERNEL);

mm/util.c char *kstrdup(const char *s, gfp_t gfp) · line 72

Quoted 10 lines
mm/util.c +10 -0
+
+	if (!p)
+		return ERR_PTR(-ENOMEM);
+
+	if (strncpy_from_user(p, s, length) < 0) {
+		kfree(p);
+		return ERR_PTR(-EFAULT);
+	}
+
+	p[length - 1] = '\0';

And still broken.

"Hello" -> length = 5 "Hello\0"[4] = 0 "Hell"

#2 lore raw
Quoted 8 lines · On Thu, 16 Feb 2006 01:25:56 +0000 Alan Cox <[email protected]> wrote:

include/linux/string.h extern char * strsep(char **,const char · line 26

Quoted 4 lines · Davi Arnaut
include/linux/string.h +4 -0
+static inline char *strdup_user(const char __user *s)
+{
+	return strndup_user(s, 4096);
+}

Still shouldn't exist. Its just a bad idea to give people broken function they don't yet use.

Ok, I will remove it. But it's a sane default, if someone wants more than 4096, they should use strndup_user.

Quoted 3 lines

mm/util.c char *kstrdup(const char *s, gfp_t gfp) · line 54

Quoted 1 line
mm/util.c +1 -0
+	length = strlen_user(s);

Should use strnlen_user or this function is useless for most cases.

Ok.

Quoted 5 lines

mm/util.c char *kstrdup(const char *s, gfp_t gfp) · line 57

Quoted 3 lines
mm/util.c +3 -0
+
+	if (!length)
+		return ERR_PTR(-EFAULT);

Zero isn't an -EFAULT length. Its a null string and valid

strlen_user returns _0_ on exception. If you don't belive me, kernel/module.c or arch/x86_64/lib/usercopy.c are a good starting point.

Quoted 18 lines
Quoted 5 lines
mm/util.c +5 -0
+
+	if (length > n)
+		length = n;
+
+	p = kmalloc(length, GFP_KERNEL);

mm/util.c char *kstrdup(const char *s, gfp_t gfp) · line 72

Quoted 10 lines
mm/util.c +10 -0
+
+	if (!p)
+		return ERR_PTR(-ENOMEM);
+
+	if (strncpy_from_user(p, s, length) < 0) {
+		kfree(p);
+		return ERR_PTR(-EFAULT);
+	}
+
+	p[length - 1] = '\0';

And still broken.

Quoted 2 lines

"Hello" -> length = 5 "Hello\0"[4] = 0 "Hell"

NO! strlen_user("Hello") -> length = 6

strlen_user returns the size of the string INCLUDING the terminating NUL.

Are we talking in the same language ?

--
Davi Arnaut

#3 lore raw
Quoted 3 lines · Davi Arnaut

strlen_user returns _0_ on exception. If you don't belive me, kernel/module.c or arch/x86_64/lib/usercopy.c are a good starting point.

My fault, I forgot that someone made strnlen_user weird, the rest looks correct.

In fact drivers/s390/char/keyboard.c like me appears to have a rather confused understanding of the return code, but can now make good use of your strndup_user function.

               len = strnlen_user(u_kbs->kb_string,
                                   sizeof(u_kbs->kb_string) - 1);
                if (!len)
                        return -EFAULT;
                if (len > sizeof(u_kbs->kb_string) - 1)
                        return -EINVAL;
                p = kmalloc(len + 1, GFP_KERNEL);
                if (!p)
                        return -ENOMEM;
                if (copy_from_user(p, u_kbs->kb_string, len)) {
                        kfree(p);
                        return -EFAULT;
                }
                p[len] = 0;

Alan

#4 lore raw
In reply to Davi Arnaut
Quoted 22 lines · On Wed, 15 Feb 2006 18:22:58 -0300 Davi Arnaut wrote:

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.

v2: Inline strdup_user and fixed a bogus strdup_user usage.

The diffstat:

 include/linux/string.h |    7 ++
 kernel/module.c        |   19 +-------
 mm/util.c              |   37 +++++++++++++++
 security/keys/keyctl.c |  116 ++++++++++---------------------------------------
 4 files changed, 72 insertions(+), 107 deletions(-)

--

include/linux/string.h +0 -0
index 369be32..8fbf139 100644

include/linux/string.h extern char * strsep(char **,const char · line 25

Quoted 8 lines
include/linux/string.h +5 -0
@@ -18,6 +18,13 @@ 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);
+
+static inline char *strdup_user(const char __user *s)
+{
+	return strndup_user(s, 4096);

PAGE_SIZE ?

Quoted 25 lines
include/linux/string.h +2 -0
+}
+
 /*
  * Include machine specific inline routines
  */
mm/util.c +5 -0
index 5f4bb59..09c2c3b 100644
@@ -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

mm/util.c char *kstrdup(const char *s, gfp_t gfp) · line 54

Quoted 10 lines
mm/util.c +10 -0
+ *
+ * @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);

This should be strnlen_user(s, n) - no need to look at the whole potentially huge string if you already have the limit.

mm/util.c char *kstrdup(const char *s, gfp_t gfp) · line 60

Quoted 6 lines
mm/util.c +6 -0
+
+	if (!length)
+		return ERR_PTR(-EFAULT);
+
+	if (length > n)
+		length = n;

This silently truncates a too long string, which might not be proper behavior (in fact, your patch #2 changes the behavior of keyctl functions, which were rejecting too long strings with -EINVAL - this is not good).

mm/util.c char *kstrdup(const char *s, gfp_t gfp) · line 67

Quoted 7 lines
mm/util.c +7 -0
+
+	p = kmalloc(length, GFP_KERNEL);
+
+	if (!p)
+		return ERR_PTR(-ENOMEM);
+
+	if (strncpy_from_user(p, s, length) < 0) {

This can be plain copy_from_user() - you already have the length, and even if someone sneaks a NUL byte in the middle, copying bytes past it will not matter.

Quoted 9 lines
mm/util.c +9 -0
+		kfree(p);
+		return ERR_PTR(-EFAULT);
+	}
+
+	p[length - 1] = '\0';
+
+	return p;
+}
+EXPORT_SYMBOL(strndup_user);