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: f935fb1fa568 ("[Huawei] 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