hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9L5IO CVE: CVE-2024-27010
--------------------------------
Fix kabi change in struct Qdisc.
Fixes: 0f022d32c3ec ("net/sched: Fix mirred deadlock on device recursion") Signed-off-by: Zhengchao Shao shaozhengchao@huawei.com --- include/net/sch_generic.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index ef62d96087ff..cb9c6f1a9569 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -99,6 +99,8 @@ struct Qdisc { * for 32-bit kernel. */ struct rcu_head rcu; + /* onwer will use 4 Bytes, and the space is enough.*/ + int owner; #endif /* * For performance sake on SMP, we put highly modified fields at the end @@ -108,7 +110,6 @@ struct Qdisc { struct gnet_stats_basic_packed bstats; seqcount_t running; struct gnet_stats_queue qstats; - int owner; unsigned long state; struct Qdisc *next_sched; struct sk_buff_head skb_bad_txq;