diff options
author | Kees Cook <keescook@chromium.org> | 2016-04-20 15:46:23 -0700 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2016-04-21 10:47:25 +1000 |
commit | b53f27e4fa0d0e72d897830cc4f3f83d2a25d952 (patch) | |
tree | b4834a2f32c2b1db43ea8e7a66600a3bfd2257fa /lib | |
parent | 3c9d6296b7aee536a96ea2b53a15d23511738c1c (diff) | |
download | op-kernel-dev-b53f27e4fa0d0e72d897830cc4f3f83d2a25d952.zip op-kernel-dev-b53f27e4fa0d0e72d897830cc4f3f83d2a25d952.tar.gz |
string_helpers: add kstrdup_quotable
Handle allocating and escaping a string safe for logging.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/string_helpers.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/lib/string_helpers.c b/lib/string_helpers.c index 5c88204..aa00c9f 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/slab.h> #include <linux/string.h> #include <linux/string_helpers.h> @@ -534,3 +535,30 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz, return p - dst; } EXPORT_SYMBOL(string_escape_mem); + +/* + * Return an allocated string that has been escaped of special characters + * and double quotes, making it safe to log in quotes. + */ +char *kstrdup_quotable(const char *src, gfp_t gfp) +{ + size_t slen, dlen; + char *dst; + const int flags = ESCAPE_HEX; + const char esc[] = "\f\n\r\t\v\a\e\\\""; + + if (!src) + return NULL; + slen = strlen(src); + + dlen = string_escape_mem(src, slen, NULL, 0, flags, esc); + dst = kmalloc(dlen + 1, gfp); + if (!dst) + return NULL; + + WARN_ON(string_escape_mem(src, slen, dst, dlen, flags, esc) != dlen); + dst[dlen] = '\0'; + + return dst; +} +EXPORT_SYMBOL_GPL(kstrdup_quotable); |