From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 25 May 2024 14:56:12 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v6.9.3~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a872032f1ae63c61f4ca80f2d98c8cf30b1f1dbe;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	series
	tty-n_gsm-fix-possible-out-of-bounds-in-gsm0_receive.patch
---

diff --git a/queue-5.15/series b/queue-5.15/series
new file mode 100644
index 00000000000..ae483180dca
--- /dev/null
+++ b/queue-5.15/series
@@ -0,0 +1 @@
+tty-n_gsm-fix-possible-out-of-bounds-in-gsm0_receive.patch
diff --git a/queue-5.15/tty-n_gsm-fix-possible-out-of-bounds-in-gsm0_receive.patch b/queue-5.15/tty-n_gsm-fix-possible-out-of-bounds-in-gsm0_receive.patch
new file mode 100644
index 00000000000..e1146659ca1
--- /dev/null
+++ b/queue-5.15/tty-n_gsm-fix-possible-out-of-bounds-in-gsm0_receive.patch
@@ -0,0 +1,63 @@
+From 47388e807f85948eefc403a8a5fdc5b406a65d5a Mon Sep 17 00:00:00 2001
+From: Daniel Starke <daniel.starke@siemens.com>
+Date: Wed, 24 Apr 2024 07:48:41 +0200
+Subject: tty: n_gsm: fix possible out-of-bounds in gsm0_receive()
+
+From: Daniel Starke <daniel.starke@siemens.com>
+
+commit 47388e807f85948eefc403a8a5fdc5b406a65d5a upstream.
+
+Assuming the following:
+- side A configures the n_gsm in basic option mode
+- side B sends the header of a basic option mode frame with data length 1
+- side A switches to advanced option mode
+- side B sends 2 data bytes which exceeds gsm->len
+  Reason: gsm->len is not used in advanced option mode.
+- side A switches to basic option mode
+- side B keeps sending until gsm0_receive() writes past gsm->buf
+  Reason: Neither gsm->state nor gsm->len have been reset after
+  reconfiguration.
+
+Fix this by changing gsm->count to gsm->len comparison from equal to less
+than. Also add upper limit checks against the constant MAX_MRU in
+gsm0_receive() and gsm1_receive() to harden against memory corruption of
+gsm->len and gsm->mru.
+
+All other checks remain as we still need to limit the data according to the
+user configuration and actual payload size.
+
+Reported-by: j51569436@gmail.com
+Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218708
+Tested-by: j51569436@gmail.com
+Fixes: e1eaea46bb40 ("tty: n_gsm line discipline")
+Cc: stable@vger.kernel.org
+Signed-off-by: Daniel Starke <daniel.starke@siemens.com>
+Link: https://lore.kernel.org/r/20240424054842.7741-1-daniel.starke@siemens.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/tty/n_gsm.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/drivers/tty/n_gsm.c
++++ b/drivers/tty/n_gsm.c
+@@ -2228,7 +2228,10 @@ static void gsm0_receive(struct gsm_mux
+ 		break;
+ 	case GSM_DATA:		/* Data */
+ 		gsm->buf[gsm->count++] = c;
+-		if (gsm->count == gsm->len) {
++		if (gsm->count >= MAX_MRU) {
++			gsm->bad_size++;
++			gsm->state = GSM_SEARCH;
++		} else if (gsm->count >= gsm->len) {
+ 			/* Calculate final FCS for UI frames over all data */
+ 			if ((gsm->control & ~PF) != UIH) {
+ 				gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf,
+@@ -2341,7 +2344,7 @@ static void gsm1_receive(struct gsm_mux
+ 		gsm->state = GSM_DATA;
+ 		break;
+ 	case GSM_DATA:		/* Data */
+-		if (gsm->count > gsm->mru) {	/* Allow one for the FCS */
++		if (gsm->count > gsm->mru || gsm->count > MAX_MRU) {	/* Allow one for the FCS */
+ 			gsm->state = GSM_OVERRUN;
+ 			gsm->bad_size++;
+ 		} else