5.7-stable patches

added patches:
	net-qrtr-fix-an-out-of-bounds-read-qrtr_endpoint_post.patch

diff --git a/queue-5.7/net-qrtr-fix-an-out-of-bounds-read-qrtr_endpoint_post.patch b/queue-5.7/net-qrtr-fix-an-out-of-bounds-read-qrtr_endpoint_post.patch
new file mode 100644 (file)
index 0000000..5b1aa35
--- /dev/null
+++ b/queue-5.7/net-qrtr-fix-an-out-of-bounds-read-qrtr_endpoint_post.patch
@@ -0,0 +1,53 @@
+From 8ff41cc21714704ef0158a546c3c4d07fae2c952 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Tue, 30 Jun 2020 14:46:15 +0300
+Subject: net: qrtr: Fix an out of bounds read qrtr_endpoint_post()
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit 8ff41cc21714704ef0158a546c3c4d07fae2c952 upstream.
+
+This code assumes that the user passed in enough data for a
+qrtr_hdr_v1 or qrtr_hdr_v2 struct, but it's not necessarily true.  If
+the buffer is too small then it will read beyond the end.
+
+Reported-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+Reported-by: syzbot+b8fe393f999a291a9ea6@syzkaller.appspotmail.com
+Fixes: 194ccc88297a ("net: qrtr: Support decoding incoming v2 packets")
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/qrtr/qrtr.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/net/qrtr/qrtr.c
++++ b/net/qrtr/qrtr.c
+@@ -427,7 +427,7 @@ int qrtr_endpoint_post(struct qrtr_endpo
+       unsigned int ver;
+       size_t hdrlen;
+ 
+-      if (len & 3)
++      if (len == 0 || len & 3)
+               return -EINVAL;
+ 
+       skb = netdev_alloc_skb(NULL, len);
+@@ -441,6 +441,8 @@ int qrtr_endpoint_post(struct qrtr_endpo
+ 
+       switch (ver) {
+       case QRTR_PROTO_VER_1:
++              if (len < sizeof(*v1))
++                      goto err;
+               v1 = data;
+               hdrlen = sizeof(*v1);
+ 
+@@ -454,6 +456,8 @@ int qrtr_endpoint_post(struct qrtr_endpo
+               size = le32_to_cpu(v1->size);
+               break;
+       case QRTR_PROTO_VER_2:
++              if (len < sizeof(*v2))
++                      goto err;
+               v2 = data;
+               hdrlen = sizeof(*v2) + v2->optlen;
+ 

diff --git a/queue-5.7/series b/queue-5.7/series
index 424b5cd876caa6ba86bd13e78bed2b4a7c76d241..53ac01068c0c24797bb1b2a2dac29589aa489f85 100644 (file)
--- a/queue-5.7/series
+++ b/queue-5.7/series
@@ -42,3 +42,4 @@ x86-entry-increase-entry_stack-size-to-a-full-page.patch
 arm64-add-kryo-3-4-xx-silver-cpu-cores-to-ssb-safeli.patch
 nfs-fix-memory-leak-of-export_path.patch
 sched-core-check-cpus_mask-not-cpus_ptr-in-__set_cpu.patch
+net-qrtr-fix-an-out-of-bounds-read-qrtr_endpoint_post.patch