From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 10 Apr 2024 19:11:02 +0000 (+0200)
Subject: 6.1-stable patches
X-Git-Tag: v4.19.312~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a088505c125a82d158ee50c6a35815ff7093c6ac;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	tty-n_gsm-require-cap_net_admin-to-attach-n_gsm0710-ldisc.patch
---

diff --git a/queue-6.1/series b/queue-6.1/series
index 4381d908906..317562c042f 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -69,3 +69,4 @@ fbmon-prevent-division-by-zero-in-fb_videomode_from_.patch
 netfilter-nf_tables-release-batch-on-table-validatio.patch
 netfilter-nf_tables-release-mutex-after-nft_gc_seq_e.patch
 netfilter-nf_tables-discard-table-flag-update-with-p.patch
+tty-n_gsm-require-cap_net_admin-to-attach-n_gsm0710-ldisc.patch
diff --git a/queue-6.1/tty-n_gsm-require-cap_net_admin-to-attach-n_gsm0710-ldisc.patch b/queue-6.1/tty-n_gsm-require-cap_net_admin-to-attach-n_gsm0710-ldisc.patch
new file mode 100644
index 00000000000..3c6ec1464cb
--- /dev/null
+++ b/queue-6.1/tty-n_gsm-require-cap_net_admin-to-attach-n_gsm0710-ldisc.patch
@@ -0,0 +1,34 @@
+From 67c37756898a5a6b2941a13ae7260c89b54e0d88 Mon Sep 17 00:00:00 2001
+From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+Date: Mon, 31 Jul 2023 15:59:42 -0300
+Subject: tty: n_gsm: require CAP_NET_ADMIN to attach N_GSM0710 ldisc
+
+From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+
+commit 67c37756898a5a6b2941a13ae7260c89b54e0d88 upstream.
+
+Any unprivileged user can attach N_GSM0710 ldisc, but it requires
+CAP_NET_ADMIN to create a GSM network anyway.
+
+Require initial namespace CAP_NET_ADMIN to do that.
+
+Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+Link: https://lore.kernel.org/r/20230731185942.279611-1-cascardo@canonical.com
+From: Salvatore Bonaccorso <carnil@debian.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/tty/n_gsm.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/tty/n_gsm.c
++++ b/drivers/tty/n_gsm.c
+@@ -2969,6 +2969,9 @@ static int gsmld_open(struct tty_struct
+ {
+ 	struct gsm_mux *gsm;
+ 
++	if (!capable(CAP_NET_ADMIN))
++		return -EPERM;
++
+ 	if (tty->ops->write == NULL)
+ 		return -EINVAL;
+