Unverified Commit 71dec73f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12182 netns: Make get_net_ns() handle zero refcount net 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/GGJOA7E7AZBFYHS3WJS5ATSF7UR2S5GS/ 
 
https://gitee.com/src-openeuler/kernel/issues/IACR2S 
 
Link:https://gitee.com/openeuler/kernel/pulls/12182

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 5c1bf1ba 29435af6

net/core/net_namespace.c

+7 −2
Original line number Diff line number Diff line
@@ -661,11 +661,16 @@ EXPORT_SYMBOL_GPL(__put_net); 
 * get_net_ns - increment the refcount of the network namespace

 * @ns: common namespace (net)

 *

 * Returns the net's common namespace.

 * Returns the net's common namespace or ERR_PTR() if ref is zero.

 */

struct ns_common *get_net_ns(struct ns_common *ns)

{

	return &get_net(container_of(ns, struct net, ns))->ns;

	struct net *net;



	net = maybe_get_net(container_of(ns, struct net, ns));

	if (net)

		return &net->ns;

	return ERR_PTR(-EINVAL);

}

EXPORT_SYMBOL_GPL(get_net_ns);