The patch titled
Subject: string: add stracpy() and stracpy_pad() mechanisms
has been removed from the -mm tree. Its filename was
string-add-stracpy-and-stracpy_pad-mechanisms.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Joe Perches <joe@xxxxxxxxxxx>
Subject: string: add stracpy() and stracpy_pad() mechanisms
Several uses of strlcpy and strscpy have had defects because the last
argument of each function is misused or typoed.
Add macro mechanisms to avoid this defect.
stracpy (copy a string to a string array) must have a string array as the
first argument (to) and uses sizeof(to) as the size.
These mechanisms verify that the to argument is an array of char or other
compatible types like u8 or unsigned char.
A BUILD_BUG is emitted when the type of to is not compatible.
Link: http://lkml.kernel.org/r/7ab8957eaf9b0931a59eff6e2bd8c5169f2f6c41.1563841972.git.joe@xxxxxxxxxxx
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Cc: Jann Horn <jannh@xxxxxxxxxx>
Cc: Jonathan Corbet <corbet@xxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Nitin Gote <nitin.r.gote@xxxxxxxxx>
Cc: Rasmus Villemoes <rasmus.villemoes@xxxxxxxxx>
Cc: Stephen Kitt <steve@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/string.h | 41 +++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
--- a/include/linux/string.h~string-add-stracpy-and-stracpy_pad-mechanisms
+++ a/include/linux/string.h
@@ -35,6 +35,47 @@ ssize_t strscpy(char *, const char *, si
/* Wraps calls to strscpy()/memset(), no arch specific code required */
ssize_t strscpy_pad(char *dest, const char *src, size_t count);
+/**
+ * stracpy - Copy a C-string into an array of char
+ * @to: Where to copy the string, must be an array of char and not a pointer
+ * @from: String to copy, may be a pointer or const char array
+ *
+ * Helper for strscpy.
+ * Copies a maximum of sizeof(@to) bytes of @from with %NUL termination.
+ *
+ * Returns:
+ * * The number of characters copied (not including the trailing %NUL)
+ * * -E2BIG if @to is a zero size array.
+ */
+#define stracpy(to, from) \
+({ \
+ size_t size = ARRAY_SIZE(to); \
+ BUILD_BUG_ON(!__same_type(typeof(*to), char)); \
+ \
+ strscpy(to, from, size); \
+})
+
+/**
+ * stracpy_pad - Copy a C-string into an array of char with %NUL padding
+ * @to: Where to copy the string, must be an array of char and not a pointer
+ * @from: String to copy, may be a pointer or const char array
+ *
+ * Helper for strscpy_pad.
+ * Copies a maximum of sizeof(@to) bytes of @from with %NUL termination
+ * and zero-pads the remaining size of @to
+ *
+ * Returns:
+ * * The number of characters copied (not including the trailing %NUL)
+ * * -E2BIG if @to is a zero size array.
+ */
+#define stracpy_pad(to, from) \
+({ \
+ size_t size = ARRAY_SIZE(to); \
+ BUILD_BUG_ON(!__same_type(typeof(*to), char)); \
+ \
+ strscpy_pad(to, from, size); \
+})
+
#ifndef __HAVE_ARCH_STRCAT
extern char * strcat(char *, const char *);
#endif
_
Patches currently in -mm which might be from joe@xxxxxxxxxxx are
kernel-doc-core-api-include-stringh-into-core-api.patch
checkpatch-dont-interpret-stack-dumps-as-commit-ids.patch
checkpatch-improve-spdx-license-checking.patch
