Skip to content
Snippets Groups Projects
Commit fe484adc authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Yongqiang Liu
Browse files

net: sched: adapt Qdisc kabi


hulk inclusion
category: bugfix
CVE: CVE-2021-39713

--------------------------------

To adapt to KABI, put rcu before gso_skb for 64-bit kernel. RCU will use
16 Bytes, and the space is enough. It's unuse for 32-bit kernel.

Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: default avatarYongqiang Liu <liuyongqiang13@huawei.com>
parent 90aafa08
No related branches found
No related tags found
No related merge requests found
......@@ -93,7 +93,13 @@ struct Qdisc {
struct gnet_stats_queue __percpu *cpu_qstats;
int padded;
refcount_t refcnt;
#ifndef __GENKSYMS__
/* To adapt to KABI, put rcu before gso_skb for 64-bit kernel.
* RCU will use 16 Bytes, and the space is enough. It's unuse
* for 32-bit kernel.
*/
struct rcu_head rcu;
#endif
/*
* For performance sake on SMP, we put highly modified fields at the end
*/
......@@ -108,7 +114,6 @@ struct Qdisc {
spinlock_t busylock ____cacheline_aligned_in_smp;
spinlock_t seqlock;
struct rcu_head rcu;
};
static inline void qdisc_refcount_inc(struct Qdisc *qdisc)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment