]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Dec 2018 12:49:11 +0000 (13:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Dec 2018 12:49:11 +0000 (13:49 +0100)
added patches:
tipc-use-destination-length-for-copy-string.patch

queue-4.19/series
queue-4.19/tipc-use-destination-length-for-copy-string.patch [new file with mode: 0644]

index 5be174bf6ef1682418cb9e2a7c9180b333663899..b68896652d14d630c528502799dbdb6baa171a34 100644 (file)
@@ -38,3 +38,4 @@ input-elan_i2c-add-support-for-elan0621-touchpad.patch
 btrfs-tree-checker-don-t-check-max-block-group-size-as-current-max-chunk-size-limit-is-unreliable.patch
 arc-change-defconfig-defaults-to-arcv2.patch
 arc-add-support-of-nfsv3-acl.patch
+tipc-use-destination-length-for-copy-string.patch
diff --git a/queue-4.19/tipc-use-destination-length-for-copy-string.patch b/queue-4.19/tipc-use-destination-length-for-copy-string.patch
new file mode 100644 (file)
index 0000000..dc1ff7f
--- /dev/null
@@ -0,0 +1,41 @@
+From 29e270fc32192e7729057963ae7120663856c93e Mon Sep 17 00:00:00 2001
+From: Guoqing Jiang <gqjiang@suse.com>
+Date: Fri, 19 Oct 2018 12:08:22 +0800
+Subject: tipc: use destination length for copy string
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Guoqing Jiang <gqjiang@suse.com>
+
+commit 29e270fc32192e7729057963ae7120663856c93e upstream.
+
+Got below warning with gcc 8.2 compiler.
+
+net/tipc/topsrv.c: In function ‘tipc_topsrv_start’:
+net/tipc/topsrv.c:660:2: warning: ‘strncpy’ specified bound depends on the length of the source argument [-Wstringop-overflow=]
+  strncpy(srv->name, name, strlen(name) + 1);
+  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+net/tipc/topsrv.c:660:27: note: length computed here
+  strncpy(srv->name, name, strlen(name) + 1);
+                           ^~~~~~~~~~~~
+So change it to correct length and use strscpy.
+
+Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
+Acked-by: Ying Xue <ying.xue@windriver.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/net/tipc/topsrv.c b/net/tipc/topsrv.c
+index d8956f7daac4..4bdea0057171 100644
+--- a/net/tipc/topsrv.c
++++ b/net/tipc/topsrv.c
+@@ -651,7 +651,7 @@ int tipc_topsrv_start(struct net *net)
+       srv->max_rcvbuf_size = sizeof(struct tipc_subscr);
+       INIT_WORK(&srv->awork, tipc_topsrv_accept);
+-      strncpy(srv->name, name, strlen(name) + 1);
++      strscpy(srv->name, name, sizeof(srv->name));
+       tn->topsrv = srv;
+       atomic_set(&tn->subscription_count, 0);