Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd76ec43 authored by Yajun Deng's avatar Yajun Deng Committed by Greg Kroah-Hartman
Browse files

net: net_namespace: Fix undefined member in key_remove_domain() 



[ Upstream commit aed0826b0cf2e488900ab92193893e803d65c070 ]

The key_domain member in struct net only exists if we define CONFIG_KEYS.
So we should add the define when we used key_domain.

Fixes: 9b242610 ("keys: Network namespace domain tag")
Signed-off-by: default avatarYajun Deng <yajun.deng@linux.dev>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3a377421

net/core/net_namespace.c

+4 −0
Original line number Diff line number Diff line
@@ -480,7 +480,9 @@ struct net *copy_net_ns(unsigned long flags, 


	if (rv < 0) {

put_userns:

#ifdef CONFIG_KEYS

		key_remove_domain(net->key_domain);

#endif

		put_user_ns(user_ns);

		net_drop_ns(net);

dec_ucounts:
@@ -612,7 +614,9 @@ static void cleanup_net(struct work_struct *work) 
	list_for_each_entry_safe(net, tmp, &net_exit_list, exit_list) {

		list_del_init(&net->exit_list);

		dec_net_namespaces(net->ucounts);

#ifdef CONFIG_KEYS

		key_remove_domain(net->key_domain);

#endif

		put_user_ns(net->user_ns);

		net_drop_ns(net);

	}