From dd0e03b5a1ed45f19eeb714faa253228b52c55fd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 22 Oct 2023 15:27:14 +0200 Subject: [PATCH] 6.5-stable patches added patches: net-make-sure-we-never-create-ifindex-0.patch --- ...-make-sure-we-never-create-ifindex-0.patch | 35 +++++++++++++++++++ queue-6.5/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 queue-6.5/net-make-sure-we-never-create-ifindex-0.patch 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 index 00000000000..8126c3d6278 --- /dev/null +++ b/queue-6.5/net-make-sure-we-never-create-ifindex-0.patch @@ -0,0 +1,35 @@ +From ceaac91dcd065db781d1ed5dfaef0686b8ec44dc Mon Sep 17 00:00:00 2001 +From: Jakub Kicinski +Date: Mon, 31 Jul 2023 10:11:58 -0700 +Subject: net: make sure we never create ifindex = 0 + +From: Jakub Kicinski + +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 +Link: https://lore.kernel.org/all/20230728162350.2a6d4979@hermes.local/ +Reviewed-by: Leon Romanovsky +Link: https://lore.kernel.org/r/20230731171159.988962-1-kuba@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + 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); + diff --git a/queue-6.5/series b/queue-6.5/series index a34eedfa03d..203e7a6a090 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -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 -- 2.47.3