5.14-stable patches

added patches:
	net-qrtr-revert-check-in-qrtr_endpoint_post.patch
	s390-sclp-fix-secure-ipl-facility-detection.patch

diff --git a/queue-5.14/net-qrtr-revert-check-in-qrtr_endpoint_post.patch b/queue-5.14/net-qrtr-revert-check-in-qrtr_endpoint_post.patch
new file mode 100644 (file)
index 0000000..e8ca86f
--- /dev/null
+++ b/queue-5.14/net-qrtr-revert-check-in-qrtr_endpoint_post.patch
@@ -0,0 +1,34 @@
+From d2cabd2dc8da78faf9b690ea521d03776686c9fe Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Thu, 2 Sep 2021 13:08:51 +0300
+Subject: net: qrtr: revert check in qrtr_endpoint_post()
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit d2cabd2dc8da78faf9b690ea521d03776686c9fe upstream.
+
+I tried to make this check stricter as a hardenning measure but it broke
+audo and wifi on these devices so revert it.
+
+Fixes: aaa8e4922c88 ("net: qrtr: make checks in qrtr_endpoint_post() stricter")
+Reported-by: John Stultz <john.stultz@linaro.org>
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Steev Klimaszewski <steev@kali.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/qrtr/qrtr.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/qrtr/qrtr.c
++++ b/net/qrtr/qrtr.c
+@@ -493,7 +493,7 @@ int qrtr_endpoint_post(struct qrtr_endpo
+               goto err;
+       }
+ 
+-      if (!size || size & 3 || len != size + hdrlen)
++      if (!size || len != ALIGN(size, 4) + hdrlen)
+               goto err;
+ 
+       if (cb->dst_port != QRTR_PORT_CTRL && cb->type != QRTR_TYPE_DATA &&

diff --git a/queue-5.14/s390-sclp-fix-secure-ipl-facility-detection.patch b/queue-5.14/s390-sclp-fix-secure-ipl-facility-detection.patch
new file mode 100644 (file)
index 0000000..10a402e
--- /dev/null
+++ b/queue-5.14/s390-sclp-fix-secure-ipl-facility-detection.patch
@@ -0,0 +1,40 @@
+From d76b14f3971a0638b6cd0da289f8b48acee287d0 Mon Sep 17 00:00:00 2001
+From: Alexander Egorenkov <egorenar@linux.ibm.com>
+Date: Thu, 9 Sep 2021 12:20:56 +0200
+Subject: s390/sclp: fix Secure-IPL facility detection
+
+From: Alexander Egorenkov <egorenar@linux.ibm.com>
+
+commit d76b14f3971a0638b6cd0da289f8b48acee287d0 upstream.
+
+Prevent out-of-range access if the returned SCLP SCCB response is smaller
+in size than the address of the Secure-IPL flag.
+
+Fixes: c9896acc7851 ("s390/ipl: Provide has_secure sysfs attribute")
+Cc: stable@vger.kernel.org # 5.2+
+Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
+Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
+Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/s390/char/sclp_early.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/s390/char/sclp_early.c
++++ b/drivers/s390/char/sclp_early.c
+@@ -45,13 +45,14 @@ static void __init sclp_early_facilities
+       sclp.has_gisaf = !!(sccb->fac118 & 0x08);
+       sclp.has_hvs = !!(sccb->fac119 & 0x80);
+       sclp.has_kss = !!(sccb->fac98 & 0x01);
+-      sclp.has_sipl = !!(sccb->cbl & 0x4000);
+       if (sccb->fac85 & 0x02)
+               S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP;
+       if (sccb->fac91 & 0x40)
+               S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_GUEST;
+       if (sccb->cpuoff > 134)
+               sclp.has_diag318 = !!(sccb->byte_134 & 0x80);
++      if (sccb->cpuoff > 137)
++              sclp.has_sipl = !!(sccb->cbl & 0x4000);
+       sclp.rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;
+       sclp.rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2;
+       sclp.rzm <<= 20;

diff --git a/queue-5.14/series b/queue-5.14/series
index 0405a50d7f81bb2820ec4ea2644730ac32e0b858..bcc8196e8d710b4b12b60271160eb5bdc1956c27 100644 (file)
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -29,3 +29,5 @@ drm-etnaviv-exec-and-mmu-state-is-lost-when-resetting-the-gpu.patch
 drm-etnaviv-fix-mmu-context-leak-on-gpu-reset.patch
 drm-etnaviv-reference-mmu-context-when-setting-up-hardware-state.patch
 drm-etnaviv-add-missing-mmu-context-put-when-reaping-mmu-mapping.patch
+s390-sclp-fix-secure-ipl-facility-detection.patch
+net-qrtr-revert-check-in-qrtr_endpoint_post.patch