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") Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com> --- include/net/net_namespace.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index dd7cdcb6ac01..8e7aa1aabe17 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -82,7 +82,6 @@ struct net { * or to unregister pernet ops * (pernet_ops_rwsem write locked). */ - struct llist_node defer_free_list; struct llist_node cleanup_list; /* namespaces on death row */ #ifdef CONFIG_KEYS @@ -201,7 +200,7 @@ struct net { #else KABI_RESERVE(1) #endif - KABI_RESERVE(2) + KABI_USE(2, struct llist_node defer_free_list) KABI_RESERVE(3) KABI_RESERVE(4) } __randomize_layout; -- 2.25.1