Commit 5812521b authored by Gu Zheng's avatar Gu Zheng Committed by David S. Miller

net: add a pre-check of net_ns in sk_change_net()

We do not need to switch the net_ns if the target net_ns the same
as the current one, so here we add a pre-check of net_ns to avoid
this as David suggested.
Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 431a9124
...@@ -2252,8 +2252,12 @@ void sock_net_set(struct sock *sk, struct net *net) ...@@ -2252,8 +2252,12 @@ void sock_net_set(struct sock *sk, struct net *net)
*/ */
static inline void sk_change_net(struct sock *sk, struct net *net) static inline void sk_change_net(struct sock *sk, struct net *net)
{ {
put_net(sock_net(sk)); struct net *current_net = sock_net(sk);
sock_net_set(sk, hold_net(net));
if (!net_eq(current_net, net)) {
put_net(current_net);
sock_net_set(sk, hold_net(net));
}
} }
static inline struct sock *skb_steal_sock(struct sk_buff *skb) static inline struct sock *skb_steal_sock(struct sk_buff *skb)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment