summaryrefslogtreecommitdiff
path: root/include/linux/string.h
diff options
context:
space:
mode:
authorTobin C. Harding <tobin@kernel.org>2019-04-05 04:58:58 +0300
committerShuah Khan <shuah@kernel.org>2019-04-09 01:44:21 +0300
commit458a3bf82df4fe1f951d0f52b1e0c1e9d5a88a3b (patch)
tree4d9df5df245f8f068f6624bbf6cf308784c90a94 /include/linux/string.h
parent6b1a4d5b1a26ae830d50e08d7b3ca0e8b3e6b453 (diff)
downloadlinux-458a3bf82df4fe1f951d0f52b1e0c1e9d5a88a3b.tar.xz
lib/string: Add strscpy_pad() function
We have a function to copy strings safely and we have a function to copy strings and zero the tail of the destination (if source string is shorter than destination buffer) but we do not have a function to do both at once. This means developers must write this themselves if they desire this functionality. This is a chore, and also leaves us open to off by one errors unnecessarily. Add a function that calls strscpy() then memset()s the tail to zero if the source string is shorter than the destination buffer. Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: Tobin C. Harding <tobin@kernel.org> Signed-off-by: Shuah Khan <shuah@kernel.org>
Diffstat (limited to 'include/linux/string.h')
-rw-r--r--include/linux/string.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/string.h b/include/linux/string.h
index 6ab0a6fa512e..4deb11f7976b 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -31,6 +31,10 @@ size_t strlcpy(char *, const char *, size_t);
#ifndef __HAVE_ARCH_STRSCPY
ssize_t strscpy(char *, const char *, size_t);
#endif
+
+/* Wraps calls to strscpy()/memset(), no arch specific code required */
+ssize_t strscpy_pad(char *dest, const char *src, size_t count);
+
#ifndef __HAVE_ARCH_STRCAT
extern char * strcat(char *, const char *);
#endif