5.4-stable patches

added patches:
	staging-ion-prevent-incorrect-reference-counting-behavour.patch

diff --git a/queue-5.4/series b/queue-5.4/series
index f3ff0ea3cc908da19afe27c61f74dcbc81140c22..cb8bce49330f6044a23a300b98255dabd5609aa1 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -57,3 +57,4 @@ ext4-fix-overhead-calculation-to-account-for-the-reserved-gdt-blocks.patch
 ext4-force-overhead-calculation-if-the-s_overhead_cluster-makes-no-sense.patch
 jbd2-fix-a-potential-race-while-discarding-reserved-buffers-after-an-abort.patch
 spi-atmel-quadspi-fix-the-buswidth-adjustment-between-spi-mem-and-controller.patch
+staging-ion-prevent-incorrect-reference-counting-behavour.patch

diff --git a/queue-5.4/staging-ion-prevent-incorrect-reference-counting-behavour.patch b/queue-5.4/staging-ion-prevent-incorrect-reference-counting-behavour.patch
new file mode 100644 (file)
index 0000000..5dc47b6
--- /dev/null
+++ b/queue-5.4/staging-ion-prevent-incorrect-reference-counting-behavour.patch
@@ -0,0 +1,31 @@
+From lee.jones@linaro.org  Mon Apr 25 17:58:17 2022
+From: Lee Jones <lee.jones@linaro.org>
+Date: Mon, 25 Apr 2022 16:51:54 +0100
+Subject: staging: ion: Prevent incorrect reference counting behavour
+To: lee.jones@linaro.org
+Cc: stable@vger.kernel.org, Dan Carpenter <dan.carpenter@oracle.com>
+Message-ID: <20220425155154.2742426-1-lee.jones@linaro.org>
+
+
+Supply additional check in order to prevent unexpected results.
+
+Fixes: b892bf75b2034 ("ion: Switch ion to use dma-buf")
+Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Lee Jones <lee.jones@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/staging/android/ion/ion.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/staging/android/ion/ion.c
++++ b/drivers/staging/android/ion/ion.c
+@@ -114,6 +114,9 @@ static void *ion_buffer_kmap_get(struct
+       void *vaddr;
+ 
+       if (buffer->kmap_cnt) {
++              if (buffer->kmap_cnt == INT_MAX)
++                      return ERR_PTR(-EOVERFLOW);
++
+               buffer->kmap_cnt++;
+               return buffer->vaddr;
+       }