4.14-stable patches

added patches:
	selftests-net-in-rxtimestamp-getopt_long-needs-terminating-null-entry.patch

diff --git a/queue-4.14/selftests-net-in-rxtimestamp-getopt_long-needs-terminating-null-entry.patch b/queue-4.14/selftests-net-in-rxtimestamp-getopt_long-needs-terminating-null-entry.patch
new file mode 100644 (file)
index 0000000..afcf3f6
--- /dev/null
+++ b/queue-4.14/selftests-net-in-rxtimestamp-getopt_long-needs-terminating-null-entry.patch
@@ -0,0 +1,31 @@
+From foo@baz Tue 16 Jun 2020 09:47:34 AM CEST
+From: tannerlove <tannerlove@google.com>
+Date: Tue, 9 Jun 2020 17:21:32 -0400
+Subject: selftests/net: in rxtimestamp getopt_long needs terminating null entry
+
+From: tannerlove <tannerlove@google.com>
+
+[ Upstream commit 865a6cbb2288f8af7f9dc3b153c61b7014fdcf1e ]
+
+getopt_long requires the last element to be filled with zeros.
+Otherwise, passing an unrecognized option can cause a segfault.
+
+Fixes: 16e781224198 ("selftests/net: Add a test to validate behavior of rx timestamps")
+Signed-off-by: Tanner Love <tannerlove@google.com>
+Acked-by: Willem de Bruijn <willemb@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/networking/timestamping/rxtimestamp.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/tools/testing/selftests/networking/timestamping/rxtimestamp.c
++++ b/tools/testing/selftests/networking/timestamping/rxtimestamp.c
+@@ -114,6 +114,7 @@ static struct option long_options[] = {
+       { "tcp", no_argument, 0, 't' },
+       { "udp", no_argument, 0, 'u' },
+       { "ip", no_argument, 0, 'i' },
++      { NULL, 0, NULL, 0 },
+ };
+ 
+ static int next_port = 19999;

diff --git a/queue-4.14/series b/queue-4.14/series
index b5e1f9b6ee8807c89ebd5dfb2c926d28c4d7afde..70bfa7872deb096091f9b6cc8fd939838144791f 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -49,3 +49,4 @@ spi-bcm2835-fix-controller-unregister-order.patch
 crypto-virtio-fix-use-after-free-in-virtio_crypto_sk.patch
 crypto-virtio-fix-src-dst-scatterlist-calculation-in.patch
 crypto-virtio-fix-dest-length-calculation-in-__virti.patch
+selftests-net-in-rxtimestamp-getopt_long-needs-terminating-null-entry.patch