3.18-stable patches

added patches:
	kobject-replace-strncpy-with-memcpy.patch

diff --git a/queue-3.18/kobject-replace-strncpy-with-memcpy.patch b/queue-3.18/kobject-replace-strncpy-with-memcpy.patch
new file mode 100644 (file)
index 0000000..5eaa6a5
--- /dev/null
+++ b/queue-3.18/kobject-replace-strncpy-with-memcpy.patch
@@ -0,0 +1,40 @@
+From 77d2a24b6107bd9b3bf2403a65c1428a9da83dd0 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Sun, 1 Jul 2018 13:57:16 -0700
+Subject: kobject: Replace strncpy with memcpy
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+commit 77d2a24b6107bd9b3bf2403a65c1428a9da83dd0 upstream.
+
+gcc 8.1.0 complains:
+
+lib/kobject.c:128:3: warning:
+       'strncpy' output truncated before terminating nul copying as many
+       bytes from a string as its length [-Wstringop-truncation]
+lib/kobject.c: In function 'kobject_get_path':
+lib/kobject.c:125:13: note: length computed here
+
+Using strncpy() is indeed less than perfect since the length of data to
+be copied has already been determined with strlen(). Replace strncpy()
+with memcpy() to address the warning and optimize the code a little.
+
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ lib/kobject.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/kobject.c
++++ b/lib/kobject.c
+@@ -127,7 +127,7 @@ static void fill_kobj_path(struct kobjec
+               int cur = strlen(kobject_name(parent));
+               /* back up enough to print this name with '/' */
+               length -= cur;
+-              strncpy(path + length, kobject_name(parent), cur);
++              memcpy(path + length, kobject_name(parent), cur);
+               *(path + --length) = '/';
+       }
+ 

diff --git a/queue-3.18/series b/queue-3.18/series
index ac29c981ae985999142f786ed93d3e62553d8892..bff6b81d4bb9346308cc769b0358f13272fbfa20 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -12,3 +12,4 @@ usb-usb-storage-add-new-ids-to-ums-realtek.patch
 usb-core-quirks-add-reset_resume-quirk-for-cherry-g230-stream-series.patch
 kbuild-suppress-packed-not-aligned-warning-for-default-setting-only.patch
 disable-stringop-truncation-warnings-for-now.patch
+kobject-replace-strncpy-with-memcpy.patch