From: Greg Kroah-Hartman Date: Sun, 22 Oct 2023 13:24:49 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v4.14.328~38 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2bf86f6494625e8693e294b618bedbb03c8eaa50;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: net-make-sure-we-never-create-ifindex-0.patch --- diff --git a/queue-6.1/net-make-sure-we-never-create-ifindex-0.patch b/queue-6.1/net-make-sure-we-never-create-ifindex-0.patch new file mode 100644 index 00000000000..a6e550b0574 --- /dev/null +++ b/queue-6.1/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 +@@ -11238,8 +11238,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.1/series b/queue-6.1/series index 74681fdd4dc..a6247e928dc 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -196,3 +196,4 @@ gpio-vf610-set-value-before-the-direction-to-avoid-a-glitch.patch asoc-pxa-fix-a-memory-leak-in-probe.patch drm-bridge-ti-sn65dsi86-associate-dsi-device-lifetim.patch drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch +net-make-sure-we-never-create-ifindex-0.patch