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 c029ecdd7495..da856aa15aa8 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -117,7 +117,6 @@ struct Qdisc { struct qdisc_skb_head q; struct gnet_stats_basic_sync bstats; struct gnet_stats_queue qstats; - int owner; unsigned long state; unsigned long state2; /* must be written under qdisc spinlock */ struct Qdisc *next_sched; @@ -129,7 +128,7 @@ struct Qdisc { struct rcu_head rcu; netdevice_tracker dev_tracker;
- KABI_RESERVE(1) + KABI_USE(1, int owner) KABI_RESERVE(2)
/* private data */