From: Greg Kroah-Hartman Date: Wed, 17 Jun 2026 07:38:12 +0000 (+0530) Subject: drop net-sched-revert-net-sched-restrict-conditions-for-a.patch from everywhere X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d14f0cc1dfda2dd5be1bfb1b65cd524c0c5dc8b;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-sched-revert-net-sched-restrict-conditions-for-a.patch from everywhere --- diff --git a/queue-5.10/net-sched-revert-net-sched-restrict-conditions-for-a.patch b/queue-5.10/net-sched-revert-net-sched-restrict-conditions-for-a.patch deleted file mode 100644 index b70abc07ea..0000000000 --- a/queue-5.10/net-sched-revert-net-sched-restrict-conditions-for-a.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 6108f7bd8568b3eef23632da7db59c43bbbd6681 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 May 2026 08:25:49 -0400 -Subject: net/sched: Revert "net/sched: Restrict conditions for adding - duplicating netems to qdisc tree" - -From: Jamal Hadi Salim - -[ Upstream commit eda0b7f203bb166c98d1418b204135bd566ac83b ] - -This reverts commit ec8e0e3d7adef940cdf9475e2352c0680189d14e. - -The original patch rejects any tree containing two netems when -either has duplication set, even when they sit on unrelated classes -of the same classful parent. That broke configurations that have -worked since netem was introduced. - -The re-entrancy problem the original commit was trying to solve is -handled by later patch using tc_depth flag. - -Doing this revert will (re)expose the original bug with multiple -netem duplication. When this patch is backported make sure -and get the full series. - -Fixes: ec8e0e3d7ade ("net/sched: Restrict conditions for adding duplicating netems to qdisc tree") -Reported-by: Ji-Soo Chung -Reported-by: Gerlinde -Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220774 -Reported-by: zyc zyc -Closes: https://lore.kernel.org/all/19adda5a1e2.12410b78222774.9191120410578703463@zohomail.cn/ -Reported-by: Manas Ghandat -Closes: https://lore.kernel.org/netdev/f69b2c8f-8325-4c2e-a011-6dbc089f30e4@gmail.com/ -Reviewed-by: Stephen Hemminger -Signed-off-by: Jamal Hadi Salim -Link: https://patch.msgid.link/20260525122556.973584-3-jhs@mojatatu.com -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - net/sched/sch_netem.c | 40 ---------------------------------------- - 1 file changed, 40 deletions(-) - -diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c -index 3e3bced82c564d..3dc6411b0a33c7 100644 ---- a/net/sched/sch_netem.c -+++ b/net/sched/sch_netem.c -@@ -985,41 +985,6 @@ static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla, - return 0; - } - --static const struct Qdisc_class_ops netem_class_ops; -- --static int check_netem_in_tree(struct Qdisc *sch, bool duplicates, -- struct netlink_ext_ack *extack) --{ -- struct Qdisc *root, *q; -- unsigned int i; -- -- root = qdisc_root_sleeping(sch); -- -- if (sch != root && root->ops->cl_ops == &netem_class_ops) { -- if (duplicates || -- ((struct netem_sched_data *)qdisc_priv(root))->duplicate) -- goto err; -- } -- -- if (!qdisc_dev(root)) -- return 0; -- -- hash_for_each(qdisc_dev(root)->qdisc_hash, i, q, hash) { -- if (sch != q && q->ops->cl_ops == &netem_class_ops) { -- if (duplicates || -- ((struct netem_sched_data *)qdisc_priv(q))->duplicate) -- goto err; -- } -- } -- -- return 0; -- --err: -- NL_SET_ERR_MSG(extack, -- "netem: cannot mix duplicating netems with other netems in tree"); -- return -EINVAL; --} -- - /* Parse netlink message to set options */ - static int netem_change(struct Qdisc *sch, struct nlattr *opt, - struct netlink_ext_ack *extack) -@@ -1087,11 +1052,6 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, - q->gap = qopt->gap; - q->counter = 0; - q->loss = qopt->loss; -- -- ret = check_netem_in_tree(sch, qopt->duplicate, extack); -- if (ret) -- goto unlock; -- - q->duplicate = qopt->duplicate; - - /* for compatibility with earlier versions. --- -2.53.0 - diff --git a/queue-5.10/series b/queue-5.10/series index f4272a6b4c..6d81f4f5ce 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -23,7 +23,6 @@ vxlan-do-not-reuse-cached-ip_hdr-value-after-skb_tun.patch tunnels-do-not-assume-transport-header-in-iptunnel_p.patch bluetooth-6lowpan-check-skb_clone-return-value-in-se.patch ipv6-rpl-fix-hdrlen-overflow-in-ipv6_rpl_srh_decompr.patch -net-sched-revert-net-sched-restrict-conditions-for-a.patch bluetooth-l2cap-clear-chan-ident-on-ecred-reconfigur.patch bluetooth-l2cap-fix-possible-crash-on-l2cap_ecred_co.patch sctp-fix-race-between-sctp_wait_for_connect-and-peel.patch diff --git a/queue-5.15/net-sched-revert-net-sched-restrict-conditions-for-a.patch b/queue-5.15/net-sched-revert-net-sched-restrict-conditions-for-a.patch deleted file mode 100644 index a32070751c..0000000000 --- a/queue-5.15/net-sched-revert-net-sched-restrict-conditions-for-a.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 15fbd43e1439577d25c3a1604fdc2ef8e46d0a66 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 May 2026 08:25:49 -0400 -Subject: net/sched: Revert "net/sched: Restrict conditions for adding - duplicating netems to qdisc tree" - -From: Jamal Hadi Salim - -[ Upstream commit eda0b7f203bb166c98d1418b204135bd566ac83b ] - -This reverts commit ec8e0e3d7adef940cdf9475e2352c0680189d14e. - -The original patch rejects any tree containing two netems when -either has duplication set, even when they sit on unrelated classes -of the same classful parent. That broke configurations that have -worked since netem was introduced. - -The re-entrancy problem the original commit was trying to solve is -handled by later patch using tc_depth flag. - -Doing this revert will (re)expose the original bug with multiple -netem duplication. When this patch is backported make sure -and get the full series. - -Fixes: ec8e0e3d7ade ("net/sched: Restrict conditions for adding duplicating netems to qdisc tree") -Reported-by: Ji-Soo Chung -Reported-by: Gerlinde -Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220774 -Reported-by: zyc zyc -Closes: https://lore.kernel.org/all/19adda5a1e2.12410b78222774.9191120410578703463@zohomail.cn/ -Reported-by: Manas Ghandat -Closes: https://lore.kernel.org/netdev/f69b2c8f-8325-4c2e-a011-6dbc089f30e4@gmail.com/ -Reviewed-by: Stephen Hemminger -Signed-off-by: Jamal Hadi Salim -Link: https://patch.msgid.link/20260525122556.973584-3-jhs@mojatatu.com -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - net/sched/sch_netem.c | 40 ---------------------------------------- - 1 file changed, 40 deletions(-) - -diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c -index 3e3bced82c564d..3dc6411b0a33c7 100644 ---- a/net/sched/sch_netem.c -+++ b/net/sched/sch_netem.c -@@ -985,41 +985,6 @@ static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla, - return 0; - } - --static const struct Qdisc_class_ops netem_class_ops; -- --static int check_netem_in_tree(struct Qdisc *sch, bool duplicates, -- struct netlink_ext_ack *extack) --{ -- struct Qdisc *root, *q; -- unsigned int i; -- -- root = qdisc_root_sleeping(sch); -- -- if (sch != root && root->ops->cl_ops == &netem_class_ops) { -- if (duplicates || -- ((struct netem_sched_data *)qdisc_priv(root))->duplicate) -- goto err; -- } -- -- if (!qdisc_dev(root)) -- return 0; -- -- hash_for_each(qdisc_dev(root)->qdisc_hash, i, q, hash) { -- if (sch != q && q->ops->cl_ops == &netem_class_ops) { -- if (duplicates || -- ((struct netem_sched_data *)qdisc_priv(q))->duplicate) -- goto err; -- } -- } -- -- return 0; -- --err: -- NL_SET_ERR_MSG(extack, -- "netem: cannot mix duplicating netems with other netems in tree"); -- return -EINVAL; --} -- - /* Parse netlink message to set options */ - static int netem_change(struct Qdisc *sch, struct nlattr *opt, - struct netlink_ext_ack *extack) -@@ -1087,11 +1052,6 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, - q->gap = qopt->gap; - q->counter = 0; - q->loss = qopt->loss; -- -- ret = check_netem_in_tree(sch, qopt->duplicate, extack); -- if (ret) -- goto unlock; -- - q->duplicate = qopt->duplicate; - - /* for compatibility with earlier versions. --- -2.53.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 012482f817..c89194e97c 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -27,7 +27,6 @@ bluetooth-6lowpan-check-skb_clone-return-value-in-se.patch bonding-refuse-to-enslave-can-devices.patch ethtool-eeprom-add-more-safeties-to-eeprom-netlink-f.patch ipv6-rpl-fix-hdrlen-overflow-in-ipv6_rpl_srh_decompr.patch -net-sched-revert-net-sched-restrict-conditions-for-a.patch bluetooth-l2cap-clear-chan-ident-on-ecred-reconfigur.patch bluetooth-l2cap-fix-possible-crash-on-l2cap_ecred_co.patch gpio-rockchip-convert-bank-clk-to-devm_clk_get_enabl.patch diff --git a/queue-6.1/net-sched-revert-net-sched-restrict-conditions-for-a.patch b/queue-6.1/net-sched-revert-net-sched-restrict-conditions-for-a.patch deleted file mode 100644 index 9983b8d4a8..0000000000 --- a/queue-6.1/net-sched-revert-net-sched-restrict-conditions-for-a.patch +++ /dev/null @@ -1,102 +0,0 @@ -From f0782e00e36a05e61adcdd37cb84129da8466d7a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 May 2026 08:25:49 -0400 -Subject: net/sched: Revert "net/sched: Restrict conditions for adding - duplicating netems to qdisc tree" - -From: Jamal Hadi Salim - -[ Upstream commit eda0b7f203bb166c98d1418b204135bd566ac83b ] - -This reverts commit ec8e0e3d7adef940cdf9475e2352c0680189d14e. - -The original patch rejects any tree containing two netems when -either has duplication set, even when they sit on unrelated classes -of the same classful parent. That broke configurations that have -worked since netem was introduced. - -The re-entrancy problem the original commit was trying to solve is -handled by later patch using tc_depth flag. - -Doing this revert will (re)expose the original bug with multiple -netem duplication. When this patch is backported make sure -and get the full series. - -Fixes: ec8e0e3d7ade ("net/sched: Restrict conditions for adding duplicating netems to qdisc tree") -Reported-by: Ji-Soo Chung -Reported-by: Gerlinde -Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220774 -Reported-by: zyc zyc -Closes: https://lore.kernel.org/all/19adda5a1e2.12410b78222774.9191120410578703463@zohomail.cn/ -Reported-by: Manas Ghandat -Closes: https://lore.kernel.org/netdev/f69b2c8f-8325-4c2e-a011-6dbc089f30e4@gmail.com/ -Reviewed-by: Stephen Hemminger -Signed-off-by: Jamal Hadi Salim -Link: https://patch.msgid.link/20260525122556.973584-3-jhs@mojatatu.com -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - net/sched/sch_netem.c | 40 ---------------------------------------- - 1 file changed, 40 deletions(-) - -diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c -index 2c47bd8dba6478..3bebe8043cfaf5 100644 ---- a/net/sched/sch_netem.c -+++ b/net/sched/sch_netem.c -@@ -984,41 +984,6 @@ static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla, - return 0; - } - --static const struct Qdisc_class_ops netem_class_ops; -- --static int check_netem_in_tree(struct Qdisc *sch, bool duplicates, -- struct netlink_ext_ack *extack) --{ -- struct Qdisc *root, *q; -- unsigned int i; -- -- root = qdisc_root_sleeping(sch); -- -- if (sch != root && root->ops->cl_ops == &netem_class_ops) { -- if (duplicates || -- ((struct netem_sched_data *)qdisc_priv(root))->duplicate) -- goto err; -- } -- -- if (!qdisc_dev(root)) -- return 0; -- -- hash_for_each(qdisc_dev(root)->qdisc_hash, i, q, hash) { -- if (sch != q && q->ops->cl_ops == &netem_class_ops) { -- if (duplicates || -- ((struct netem_sched_data *)qdisc_priv(q))->duplicate) -- goto err; -- } -- } -- -- return 0; -- --err: -- NL_SET_ERR_MSG(extack, -- "netem: cannot mix duplicating netems with other netems in tree"); -- return -EINVAL; --} -- - /* Parse netlink message to set options */ - static int netem_change(struct Qdisc *sch, struct nlattr *opt, - struct netlink_ext_ack *extack) -@@ -1083,11 +1048,6 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, - q->gap = qopt->gap; - q->counter = 0; - q->loss = qopt->loss; -- -- ret = check_netem_in_tree(sch, qopt->duplicate, extack); -- if (ret) -- goto unlock; -- - q->duplicate = qopt->duplicate; - - /* for compatibility with earlier versions. --- -2.53.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 0c6077a947..e67e109a9f 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -30,7 +30,6 @@ bluetooth-6lowpan-check-skb_clone-return-value-in-se.patch bonding-refuse-to-enslave-can-devices.patch ethtool-eeprom-add-more-safeties-to-eeprom-netlink-f.patch ipv6-rpl-fix-hdrlen-overflow-in-ipv6_rpl_srh_decompr.patch -net-sched-revert-net-sched-restrict-conditions-for-a.patch bluetooth-l2cap-clear-chan-ident-on-ecred-reconfigur.patch bluetooth-l2cap-fix-possible-crash-on-l2cap_ecred_co.patch gpio-rockchip-convert-bank-clk-to-devm_clk_get_enabl.patch diff --git a/queue-6.6/net-sched-revert-net-sched-restrict-conditions-for-a.patch b/queue-6.6/net-sched-revert-net-sched-restrict-conditions-for-a.patch deleted file mode 100644 index a1b944e12a..0000000000 --- a/queue-6.6/net-sched-revert-net-sched-restrict-conditions-for-a.patch +++ /dev/null @@ -1,102 +0,0 @@ -From a932c98b8851c7876d67b1af2e0141a344502b88 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 May 2026 08:25:49 -0400 -Subject: net/sched: Revert "net/sched: Restrict conditions for adding - duplicating netems to qdisc tree" - -From: Jamal Hadi Salim - -[ Upstream commit eda0b7f203bb166c98d1418b204135bd566ac83b ] - -This reverts commit ec8e0e3d7adef940cdf9475e2352c0680189d14e. - -The original patch rejects any tree containing two netems when -either has duplication set, even when they sit on unrelated classes -of the same classful parent. That broke configurations that have -worked since netem was introduced. - -The re-entrancy problem the original commit was trying to solve is -handled by later patch using tc_depth flag. - -Doing this revert will (re)expose the original bug with multiple -netem duplication. When this patch is backported make sure -and get the full series. - -Fixes: ec8e0e3d7ade ("net/sched: Restrict conditions for adding duplicating netems to qdisc tree") -Reported-by: Ji-Soo Chung -Reported-by: Gerlinde -Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220774 -Reported-by: zyc zyc -Closes: https://lore.kernel.org/all/19adda5a1e2.12410b78222774.9191120410578703463@zohomail.cn/ -Reported-by: Manas Ghandat -Closes: https://lore.kernel.org/netdev/f69b2c8f-8325-4c2e-a011-6dbc089f30e4@gmail.com/ -Reviewed-by: Stephen Hemminger -Signed-off-by: Jamal Hadi Salim -Link: https://patch.msgid.link/20260525122556.973584-3-jhs@mojatatu.com -Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin ---- - net/sched/sch_netem.c | 40 ---------------------------------------- - 1 file changed, 40 deletions(-) - -diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c -index f8c5c506180858..827489b31626bb 100644 ---- a/net/sched/sch_netem.c -+++ b/net/sched/sch_netem.c -@@ -1005,41 +1005,6 @@ static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla, - return 0; - } - --static const struct Qdisc_class_ops netem_class_ops; -- --static int check_netem_in_tree(struct Qdisc *sch, bool duplicates, -- struct netlink_ext_ack *extack) --{ -- struct Qdisc *root, *q; -- unsigned int i; -- -- root = qdisc_root_sleeping(sch); -- -- if (sch != root && root->ops->cl_ops == &netem_class_ops) { -- if (duplicates || -- ((struct netem_sched_data *)qdisc_priv(root))->duplicate) -- goto err; -- } -- -- if (!qdisc_dev(root)) -- return 0; -- -- hash_for_each(qdisc_dev(root)->qdisc_hash, i, q, hash) { -- if (sch != q && q->ops->cl_ops == &netem_class_ops) { -- if (duplicates || -- ((struct netem_sched_data *)qdisc_priv(q))->duplicate) -- goto err; -- } -- } -- -- return 0; -- --err: -- NL_SET_ERR_MSG(extack, -- "netem: cannot mix duplicating netems with other netems in tree"); -- return -EINVAL; --} -- - /* Parse netlink message to set options */ - static int netem_change(struct Qdisc *sch, struct nlattr *opt, - struct netlink_ext_ack *extack) -@@ -1116,11 +1081,6 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, - q->gap = qopt->gap; - q->counter = 0; - q->loss = qopt->loss; -- -- ret = check_netem_in_tree(sch, qopt->duplicate, extack); -- if (ret) -- goto unlock; -- - q->duplicate = qopt->duplicate; - - /* for compatibility with earlier versions. --- -2.53.0 - diff --git a/queue-6.6/series b/queue-6.6/series index a051196b30..295c1c8454 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -37,7 +37,6 @@ bonding-refuse-to-enslave-can-devices.patch ethtool-eeprom-add-missing-ethnl_ops_begin-_complete.patch ethtool-eeprom-add-more-safeties-to-eeprom-netlink-f.patch ipv6-rpl-fix-hdrlen-overflow-in-ipv6_rpl_srh_decompr.patch -net-sched-revert-net-sched-restrict-conditions-for-a.patch bluetooth-l2cap-clear-chan-ident-on-ecred-reconfigur.patch bluetooth-l2cap-fix-possible-crash-on-l2cap_ecred_co.patch gpio-rockchip-convert-bank-clk-to-devm_clk_get_enabl.patch