Commit b7b0c386 authored by Zhengchao Shao's avatar Zhengchao Shao
Browse files

net/sched: fix kabi change in struct Qdisc 

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: default avatarZhengchao Shao <shaozhengchao@huawei.com>
parent 39d9ab89

include/net/sch_generic.h

+1 −2
Original line number Diff line number Diff line
@@ -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 */