Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1377024

[PATCH v4 2/6] string_helpers: add kstrdup_quotable_cmdline

Show all headers | View raw

Provide an escaped (but readable: no inter-argument NULLs) commandline
safe for logging.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 include/linux/string_helpers.h |  1 +
 lib/string_helpers.c           | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h
index 9de228af00c1..684d2695fc36 100644
--- a/include/linux/string_helpers.h
+++ b/include/linux/string_helpers.h
@@ -69,5 +69,6 @@ static inline int string_escape_str_any_np(const char *src, char *dst,
 }
 
 char *kstrdup_quotable(const char *src, gfp_t gfp);
+char *kstrdup_quotable_cmdline(struct task_struct *task, gfp_t gfp);
 
 #endif
diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index aa00c9f989ee..b16ee85aaf87 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -10,6 +10,7 @@
 #include <linux/export.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
+#include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/string_helpers.h>
@@ -562,3 +563,36 @@ char *kstrdup_quotable(const char *src, gfp_t gfp)
 	return dst;
 }
 EXPORT_SYMBOL_GPL(kstrdup_quotable);
+
+/*
+ * Returns allocated NULL-terminated string containing process
+ * command line, with inter-argument NULLs replaced with spaces,
+ * and other special characters escaped.
+ */
+char *kstrdup_quotable_cmdline(struct task_struct *task, gfp_t gfp)
+{
+	char *buffer, *quoted;
+	int i, res;
+
+	buffer = kmalloc(PAGE_SIZE, GFP_TEMPORARY);
+	if (!buffer)
+		return NULL;
+
+	res = get_cmdline(task, buffer, PAGE_SIZE - 1);
+	buffer[res] = '\0';
+
+	/* Collapse trailing NULLs, leave res pointing to last non-NULL. */
+	while (--res >= 0 && buffer[res] == '\0')
+		;
+
+	/* Replace inter-argument NULLs. */
+	for (i = 0; i <= res; i++)
+		if (buffer[i] == '\0')
+			buffer[i] = ' ';
+
+	/* Make sure result is printable. */
+	quoted = kstrdup_quotable(buffer, gfp);
+	kfree(buffer);
+	return quoted;
+}
+EXPORT_SYMBOL_GPL(kstrdup_quotable_cmdline);
-- 
2.6.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 0/6] LSM: LoadPin for kernel file loading restrictions Kees Cook <keescook@chromium.org> - 2016-04-12 19:00 +0200
  [PATCH v4 2/6] string_helpers: add kstrdup_quotable_cmdline Kees Cook <keescook@chromium.org> - 2016-04-12 19:00 +0200
    Re: [PATCH v4 2/6] string_helpers: add kstrdup_quotable_cmdline "Serge E. Hallyn" <serge@hallyn.com> - 2016-04-12 23:20 +0200
      Re: [PATCH v4 2/6] string_helpers: add kstrdup_quotable_cmdline Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-04-13 14:00 +0200
  [PATCH v4 5/6] fs: provide function to report enum strings Kees Cook <keescook@chromium.org> - 2016-04-12 19:00 +0200
    Re: [PATCH v4 5/6] fs: provide function to report enum strings Kees Cook <keescook@chromium.org> - 2016-04-13 00:40 +0200
      Re: [PATCH v4 5/6] fs: provide function to report enum strings Mimi Zohar <zohar@linux.vnet.ibm.com> - 2016-04-13 14:00 +0200
    Re: [PATCH v4 5/6] fs: provide function to report enum strings Al Viro <viro@ZenIV.linux.org.uk> - 2016-04-13 00:40 +0200
  [PATCH v4 6/6] LSM: LoadPin for kernel file loading restrictions Kees Cook <keescook@chromium.org> - 2016-04-12 19:00 +0200

csiph-web