Skip to contentSkip to conversation

+ mm-utilc-add-kstrimdup.patch added to -mm tree

PATCH [email protected] 4 participants 6 messages Jan 31, 2014 – Feb 4, 2014

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

Subject: + mm-utilc-add-kstrimdup.patch added to -mm tree
To: [email protected],[email protected],[email protected]
From: [email protected]
Date: Fri, 31 Jan 2014 13:45:02 -0800

The patch titled
Subject: mm/util.c: add kstrimdup()
has been added to the -mm tree. Its filename is
mm-utilc-add-kstrimdup.patch

This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-utilc-add-kstrimdup.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-utilc-add-kstrimdup.patch

Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

The -mm tree is included into linux-next and is updated there every 3-4 working days

------------------------------------------------------
From: Sebastian Capella <[email protected]>
Subject: mm/util.c: add kstrimdup()

kstrimdup() creates a whitespace-trimmed duplicate of the passed in null-terminated string. This is useful for strings coming from sysfs that often include trailing whitespace due to user input.

Thanks to Joe Perches for this implementation.

---

 include/linux/string.h |    1 +
 mm/util.c              |   30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
include/linux/string.h renamed from include/linux/string.h~mm-utilc-add-kstrimdup +1 -0
diff -puN include/linux/string.h~mm-utilc-add-kstrimdup include/linux/string.h
@@ -114,6 +114,7 @@ void *memchr_inv(const void *s, int c, s
 
 extern char *kstrdup(const char *s, gfp_t gfp);
 extern char *kstrndup(const char *s, size_t len, gfp_t gfp);
+extern char *kstrimdup(const char *s, gfp_t gfp);
 extern void *kmemdup(const void *src, size_t len, gfp_t gfp);
 
 extern char **argv_split(gfp_t gfp, const char *str, int *argcp);
mm/util.c renamed from mm/util.c~mm-utilc-add-kstrimdup +30 -0
diff -puN mm/util.c~mm-utilc-add-kstrimdup mm/util.c
@@ -1,6 +1,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/ctype.h>
 #include <linux/export.h>
 #include <linux/err.h>
 #include <linux/sched.h>
@@ -63,6 +64,35 @@ char *kstrndup(const char *s, size_t max
 EXPORT_SYMBOL(kstrndup);
 
 /**
+ * kstrimdup - Trim and copy a %NUL terminated string.
+ * @s: the string to trim and duplicate
+ * @gfp: the GFP mask used in the kmalloc() call when allocating memory
+ *
+ * Returns an address, which the caller must kfree, containing
+ * a duplicate of the passed string with leading and/or trailing
+ * whitespace (as defined by isspace) removed.
+ */
+char *kstrimdup(const char *s, gfp_t gfp)
+{
+	char *buf;
+	char *begin = skip_spaces(s);
+	size_t len = strlen(begin);
+
+	while (len && isspace(begin[len - 1]))
+		len--;
+
+	buf = kmalloc_track_caller(len + 1, gfp);
+	if (!buf)
+		return NULL;
+
+	memcpy(buf, begin, len);
+	buf[len] = '\0';
+
+	return buf;
+}
+EXPORT_SYMBOL(kstrimdup);
+
+/**
  * kmemdup - duplicate region of memory
  *
  * @src: memory region to duplicate

_

Patches currently in -mm which might be from [email protected] are

mm-utilc-add-kstrimdup.patch

#1 lore raw
Quoted 3 lines · On Sat, Feb 1, 2014 at 12:45 AM, <[email protected]> wrote:

kstrimdup() creates a whitespace-trimmed duplicate of the passed in null-terminated string. This is useful for strings coming from sysfs that often include trailing whitespace due to user input.

I think kernel should be strict in what it accepts, otherwise case-insensivity and
what not will be added some day.

Shell will trim whitespace for you.

#2 lore raw
Quoted 10 lines · Alexey Dobriyan
Quoted 3 lines

kstrimdup() creates a whitespace-trimmed duplicate of the passed in null-terminated string. This is useful for strings coming from sysfs that often include trailing whitespace due to user input.

I think kernel should be strict in what it accepts, otherwise case-insensivity and
what not will be added some day.

Shell will trim whitespace for you.

The last we heard, I think Sebastian is looking to redo this series and this patch is no longer needed. Sebastian?

#3 lore raw

Quoting David Rientjes (2014-02-03 17:05:04)

Quoted 2 lines

The last we heard, I think Sebastian is looking to redo this series and this patch is no longer needed. Sebastian?

Hi David, Alexey,

I am in the process of reworking the patches. I'm not sure if Andrew was just interested in having the kstrimdup utility function available.

Isn't it too late to impose userspace trimming of newlines for sysfs? It seems already fairly common and expected for the kernel to eat the trailing whitespace, or at least ignore it. If we change this won't we be breaking userspace / tools / instructions / etc?

I'll try to post the new patches soon.

Thanks,

Sebastian

#4 lore raw
Quoted 3 lines · Sebastian Capella

I am in the process of reworking the patches. I'm not sure if Andrew was just interested in having the kstrimdup utility function available.

I think the point Alexey is making is that whitespace is already stripped by the shell unless quoted; it seemed that you may have had a usecase where the string to be written would not be stripped by the shell for whatever reason and there was no convenient way to do it specifically for the file you were modifying?

author maintainer
#5 lore raw
In reply to Sebastian Capella
Quoted 5 lines · On Mon, 03 Feb 2014 17:28:16 -0800 Sebastian Capella…

Quoting David Rientjes (2014-02-03 17:05:04)

Quoted 2 lines

The last we heard, I think Sebastian is looking to redo this series and this patch is no longer needed. Sebastian?

Hi David, Alexey,

Quoted 8 lines

I am in the process of reworking the patches. I'm not sure if Andrew was just interested in having the kstrimdup utility function available.

Isn't it too late to impose userspace trimming of newlines for sysfs? It seems already fairly common and expected for the kernel to eat the trailing whitespace, or at least ignore it. If we change this won't we be breaking userspace / tools / instructions / etc?

We have quite a lot of codesites which open-code the newline trimming. Providing a library function to do this will result in goodness.

That being said, I don't plan to merge kstrimdup() until it has some users.