Commit 87174aa6 authored by Dong Chenchen's avatar Dong Chenchen
Browse files

net: Fix kabi breakage 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")
Signed-off-by: default avatarDong Chenchen <dongchenchen2@huawei.com>
parent fedad883

include/net/net_namespace.h

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



	struct user_namespace   *user_ns;	/* Owning user namespace */
@@ -107,6 +106,9 @@ struct net { 
	struct netns_mib	mib;

	struct netns_packet	packet;

	struct netns_unix	unx;

#ifndef __GENKSYMS__

	struct llist_node       defer_free_list;

#endif

	struct netns_ipv4	ipv4;

#if IS_ENABLED(CONFIG_IPV6)

	struct netns_ipv6	ipv6;