[PATCH OLK-6.6 v2] net: Fix kabi breakage for defer_free_list in struct net

hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBEAMS CVE: CVE-2024-56658 -------------------------------- Fix kabi breakage in struct net. Fixes: 0f6ede9fbc74 ("net: defer final 'struct net' free in netns dismantle") Fixes: da47796c8d1b ("net: Fix kabi breakage in struct net") Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com> --- include/net/net_namespace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index f687951d6d34..9f1bb06ebb99 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -75,7 +75,6 @@ struct net { spinlock_t nsid_lock; atomic_t fnhe_genid; - KABI_FILL_HOLE(struct llist_node defer_free_list) struct list_head list; /* list of network namespaces */ struct list_head exit_list; /* To linked to call pernet exit * methods on dead net ( @@ -161,6 +160,7 @@ struct net { /* Used to store attached BPF programs */ struct netns_bpf bpf; + KABI_FILL_HOLE(struct llist_node defer_free_list) /* Note : following structs are cache line aligned */ #ifdef CONFIG_XFRM -- 2.25.1

反馈: 您发送到kernel@openeuler.org的补丁/补丁集,已成功转换为PR! PR链接地址: https://gitee.com/openeuler/kernel/pulls/17238 邮件列表地址:https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/L33... FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://gitee.com/openeuler/kernel/pulls/17238 Mailing list address: https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/L33...
participants (2)
-
Dong Chenchen
-
patchwork bot