From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 27 Aug 2023 10:10:48 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v6.1.49~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4873bd87876967696eae1a09085167f2079f5d3e;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	rtnetlink-reject-negative-ifindexes-in-rtm_newlink.patch
---

diff --git a/queue-5.4/rtnetlink-reject-negative-ifindexes-in-rtm_newlink.patch b/queue-5.4/rtnetlink-reject-negative-ifindexes-in-rtm_newlink.patch
new file mode 100644
index 00000000000..f01dcc3256f
--- /dev/null
+++ b/queue-5.4/rtnetlink-reject-negative-ifindexes-in-rtm_newlink.patch
@@ -0,0 +1,68 @@
+From 30188bd7838c16a98a520db1fe9df01ffc6ed368 Mon Sep 17 00:00:00 2001
+From: Ido Schimmel <idosch@nvidia.com>
+Date: Wed, 23 Aug 2023 09:43:48 +0300
+Subject: rtnetlink: Reject negative ifindexes in RTM_NEWLINK
+
+From: Ido Schimmel <idosch@nvidia.com>
+
+commit 30188bd7838c16a98a520db1fe9df01ffc6ed368 upstream.
+
+Negative ifindexes are illegal, but the kernel does not validate the
+ifindex in the ancillary header of RTM_NEWLINK messages, resulting in
+the kernel generating a warning [1] when such an ifindex is specified.
+
+Fix by rejecting negative ifindexes.
+
+[1]
+WARNING: CPU: 0 PID: 5031 at net/core/dev.c:9593 dev_index_reserve+0x1a2/0x1c0 net/core/dev.c:9593
+[...]
+Call Trace:
+ <TASK>
+ register_netdevice+0x69a/0x1490 net/core/dev.c:10081
+ br_dev_newlink+0x27/0x110 net/bridge/br_netlink.c:1552
+ rtnl_newlink_create net/core/rtnetlink.c:3471 [inline]
+ __rtnl_newlink+0x115e/0x18c0 net/core/rtnetlink.c:3688
+ rtnl_newlink+0x67/0xa0 net/core/rtnetlink.c:3701
+ rtnetlink_rcv_msg+0x439/0xd30 net/core/rtnetlink.c:6427
+ netlink_rcv_skb+0x16b/0x440 net/netlink/af_netlink.c:2545
+ netlink_unicast_kernel net/netlink/af_netlink.c:1342 [inline]
+ netlink_unicast+0x536/0x810 net/netlink/af_netlink.c:1368
+ netlink_sendmsg+0x93c/0xe40 net/netlink/af_netlink.c:1910
+ sock_sendmsg_nosec net/socket.c:728 [inline]
+ sock_sendmsg+0xd9/0x180 net/socket.c:751
+ ____sys_sendmsg+0x6ac/0x940 net/socket.c:2538
+ ___sys_sendmsg+0x135/0x1d0 net/socket.c:2592
+ __sys_sendmsg+0x117/0x1e0 net/socket.c:2621
+ do_syscall_x64 arch/x86/entry/common.c:50 [inline]
+ do_syscall_64+0x38/0xb0 arch/x86/entry/common.c:80
+ entry_SYSCALL_64_after_hwframe+0x63/0xcd
+
+Fixes: 38f7b870d4a6 ("[RTNETLINK]: Link creation API")
+Reported-by: syzbot+5ba06978f34abb058571@syzkaller.appspotmail.com
+Signed-off-by: Ido Schimmel <idosch@nvidia.com>
+Reviewed-by: Jiri Pirko <jiri@nvidia.com>
+Reviewed-by: Jakub Kicinski <kuba@kernel.org>
+Link: https://lore.kernel.org/r/20230823064348.2252280-1-idosch@nvidia.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/core/rtnetlink.c |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/net/core/rtnetlink.c
++++ b/net/core/rtnetlink.c
+@@ -3076,9 +3076,12 @@ replay:
+ 		ifname[0] = '\0';
+ 
+ 	ifm = nlmsg_data(nlh);
+-	if (ifm->ifi_index > 0)
++	if (ifm->ifi_index > 0) {
+ 		dev = __dev_get_by_index(net, ifm->ifi_index);
+-	else {
++	} else if (ifm->ifi_index < 0) {
++		NL_SET_ERR_MSG(extack, "ifindex can't be negative");
++		return -EINVAL;
++	} else {
+ 		if (ifname[0])
+ 			dev = __dev_get_by_name(net, ifname);
+ 		else
diff --git a/queue-5.4/series b/queue-5.4/series
index b89c7c79c70..e9721d3d146 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -146,3 +146,4 @@ pci-acpiphp-use-pci_assign_unassigned_bridge_resources-only-for-non-root-bus.pat
 drm-display-dp-fix-the-dp-dsc-receiver-cap-size.patch
 x86-fpu-set-x86_feature_osxsave-feature-after-enabling-osxsave-in-cr4.patch
 mm-allow-a-controlled-amount-of-unfairness-in-the-page-lock.patch
+rtnetlink-reject-negative-ifindexes-in-rtm_newlink.patch