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, 1 insertion(+), 2 deletions(-)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 6c479b73ab3e..efacdfee3702 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -104,7 +104,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; @@ -116,7 +115,7 @@ struct Qdisc { bool empty; struct rcu_head rcu;
- KABI_RESERVE(1) + KABI_USE(1, int owner) KABI_RESERVE(2)
/* private data */