From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 27 Aug 2024 14:22:34 +0000 (+0200)
Subject: 6.1-stable patches
X-Git-Tag: v6.1.107~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c25f375bf31cf3d599e27ff7a344de8654f5ed28;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	input-mt-limit-max-slots.patch
---

diff --git a/queue-6.1/input-mt-limit-max-slots.patch b/queue-6.1/input-mt-limit-max-slots.patch
new file mode 100644
index 00000000000..755ecfb5ac6
--- /dev/null
+++ b/queue-6.1/input-mt-limit-max-slots.patch
@@ -0,0 +1,37 @@
+From 99d3bf5f7377d42f8be60a6b9cb60fb0be34dceb Mon Sep 17 00:00:00 2001
+From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
+Date: Mon, 29 Jul 2024 21:51:30 +0900
+Subject: Input: MT - limit max slots
+
+From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
+
+commit 99d3bf5f7377d42f8be60a6b9cb60fb0be34dceb upstream.
+
+syzbot is reporting too large allocation at input_mt_init_slots(), for
+num_slots is supplied from userspace using ioctl(UI_DEV_CREATE).
+
+Since nobody knows possible max slots, this patch chose 1024.
+
+Reported-by: syzbot <syzbot+0122fa359a69694395d5@syzkaller.appspotmail.com>
+Closes: https://syzkaller.appspot.com/bug?extid=0122fa359a69694395d5
+Suggested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: George Kennedy <george.kennedy@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/input/input-mt.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/input/input-mt.c
++++ b/drivers/input/input-mt.c
+@@ -46,6 +46,9 @@ int input_mt_init_slots(struct input_dev
+ 		return 0;
+ 	if (mt)
+ 		return mt->num_slots != num_slots ? -EINVAL : 0;
++	/* Arbitrary limit for avoiding too large memory allocation. */
++	if (num_slots > 1024)
++		return -EINVAL;
+ 
+ 	mt = kzalloc(struct_size(mt, slots, num_slots), GFP_KERNEL);
+ 	if (!mt)
diff --git a/queue-6.1/series b/queue-6.1/series
index f4b1204833d..0708887c581 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -318,4 +318,5 @@ ice-fix-w-1-headers-mismatch.patch
 revert-jfs-fix-shift-out-of-bounds-in-dbjoin.patch
 net-change-maximum-number-of-udp-segments-to-128.patch
 selftests-net-more-strict-check-in-net_helper.patch
+input-mt-limit-max-slots.patch
 selftests-net-remove-executable-bits-from-library-scripts.patch