]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.5-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Oct 2023 13:27:14 +0000 (15:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Oct 2023 13:27:14 +0000 (15:27 +0200)
added patches:
net-make-sure-we-never-create-ifindex-0.patch

queue-6.5/net-make-sure-we-never-create-ifindex-0.patch [new file with mode: 0644]
queue-6.5/series

diff --git a/queue-6.5/net-make-sure-we-never-create-ifindex-0.patch b/queue-6.5/net-make-sure-we-never-create-ifindex-0.patch
new file mode 100644 (file)
index 0000000..8126c3d
--- /dev/null
@@ -0,0 +1,35 @@
+From ceaac91dcd065db781d1ed5dfaef0686b8ec44dc Mon Sep 17 00:00:00 2001
+From: Jakub Kicinski <kuba@kernel.org>
+Date: Mon, 31 Jul 2023 10:11:58 -0700
+Subject: net: make sure we never create ifindex = 0
+
+From: Jakub Kicinski <kuba@kernel.org>
+
+commit ceaac91dcd065db781d1ed5dfaef0686b8ec44dc upstream.
+
+Instead of allocating from 1 use proper xa_init flag,
+to protect ourselves from IDs wrapping back to 0.
+
+Fixes: 759ab1edb56c ("net: store netdevs in an xarray")
+Reported-by: Stephen Hemminger <stephen@networkplumber.org>
+Link: https://lore.kernel.org/all/20230728162350.2a6d4979@hermes.local/
+Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
+Link: https://lore.kernel.org/r/20230731171159.988962-1-kuba@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/core/dev.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -11253,8 +11253,7 @@ static int __net_init netdev_init(struct
+       if (net->dev_index_head == NULL)
+               goto err_idx;
+-      net->ifindex = 1;
+-      xa_init_flags(&net->dev_by_index, XA_FLAGS_ALLOC);
++      xa_init_flags(&net->dev_by_index, XA_FLAGS_ALLOC1);
+       RAW_INIT_NOTIFIER_HEAD(&net->netdev_chain);
index a34eedfa03d7d11a4405df06daf0a5769e1e975b..203e7a6a090331e4d767d88c00a294d054470d27 100644 (file)
@@ -225,3 +225,4 @@ drm-i915-cx0-only-clear-set-the-pipe-reset-bit-of-th.patch
 drm-amdgpu-fix-possible-null-pointer-dereference.patch
 powerpc-mm-allow-arch_force_max_order-up-to-12.patch
 powerpc-qspinlock-fix-stale-propagated-yield_cpu.patch
+net-make-sure-we-never-create-ifindex-0.patch