]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Dec 2018 05:59:15 +0000 (06:59 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Dec 2018 05:59:15 +0000 (06:59 +0100)
added patches:
kobject-replace-strncpy-with-memcpy.patch

queue-4.4/kobject-replace-strncpy-with-memcpy.patch [new file with mode: 0644]
queue-4.4/series

diff --git a/queue-4.4/kobject-replace-strncpy-with-memcpy.patch b/queue-4.4/kobject-replace-strncpy-with-memcpy.patch
new file mode 100644 (file)
index 0000000..5eaa6a5
--- /dev/null
@@ -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) = '/';
+       }
index e6491e501eab6c8a935ad980cdba410c503ebaa2..8e16d2dd7fdf87cdf3169a632c3868ebaddb62e0 100644 (file)
@@ -21,3 +21,4 @@ misc-mic-scif-fix-copy-paste-error-in-scif_create_remote_lookup.patch
 kbuild-suppress-packed-not-aligned-warning-for-default-setting-only.patch
 exec-avoid-gcc-8-warning-for-get_task_comm.patch
 disable-stringop-truncation-warnings-for-now.patch
+kobject-replace-strncpy-with-memcpy.patch