From 1acd2aad2e8485905aa7523d22d95ca85a235a71 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 27 Nov 2021 12:57:20 +0100 Subject: [PATCH] 4.4-stable patches added patches: staging-ion-prevent-incorrect-reference-counting-behavour.patch --- queue-4.14/series | 0 queue-4.4/series | 1 + ...ncorrect-reference-counting-behavour.patch | 43 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 queue-4.14/series create mode 100644 queue-4.4/series create mode 100644 queue-4.4/staging-ion-prevent-incorrect-reference-counting-behavour.patch diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..e69de29bb2d diff --git a/queue-4.4/series b/queue-4.4/series new file mode 100644 index 00000000000..7b79d4f4105 --- /dev/null +++ b/queue-4.4/series @@ -0,0 +1 @@ +staging-ion-prevent-incorrect-reference-counting-behavour.patch diff --git a/queue-4.4/staging-ion-prevent-incorrect-reference-counting-behavour.patch b/queue-4.4/staging-ion-prevent-incorrect-reference-counting-behavour.patch new file mode 100644 index 00000000000..28c641ee30a --- /dev/null +++ b/queue-4.4/staging-ion-prevent-incorrect-reference-counting-behavour.patch @@ -0,0 +1,43 @@ +From lee.jones@linaro.org Sat Nov 27 12:56:17 2021 +From: Lee Jones +Date: Fri, 26 Nov 2021 10:33:35 +0000 +Subject: staging: ion: Prevent incorrect reference counting behavour +To: lee.jones@linaro.org +Cc: devel@driverdev.osuosl.org, arve@android.com, stable@vger.kernel.org, riandrews@android.com, labbott@redhat.com, sumit.semwal@linaro.org, Dan Carpenter +Message-ID: <20211126103335.880816-1-lee.jones@linaro.org> + +From: Lee Jones + +Supply additional checks in order to prevent unexpected results. + +Fixes: b892bf75b2034 ("ion: Switch ion to use dma-buf") +Suggested-by: Dan Carpenter +Signed-off-by: Lee Jones +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/android/ion/ion.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/staging/android/ion/ion.c ++++ b/drivers/staging/android/ion/ion.c +@@ -606,6 +606,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; + } +@@ -626,6 +629,9 @@ static void *ion_handle_kmap_get(struct + void *vaddr; + + if (handle->kmap_cnt) { ++ if (handle->kmap_cnt == INT_MAX) ++ return ERR_PTR(-EOVERFLOW); ++ + handle->kmap_cnt++; + return buffer->vaddr; + } -- 2.47.2