diff options
| author | Gu Zheng <guz.fnst@cn.fujitsu.com> | 2014-03-10 02:57:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-10 21:29:48 +0100 |
| commit | 5812521be0f79583a26e203ac5f23de679cbdd94 (patch) | |
| tree | a57bf248f7ffba9d37e7999dc3b2c215df999cea | |
| parent | tcp: timestamp SYN+DATA messages (diff) | |
| download | linux-5812521be0f79583a26e203ac5f23de679cbdd94.tar.xz linux-5812521be0f79583a26e203ac5f23de679cbdd94.zip | |
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: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/sock.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 5c3f7c3624aa..967856970a51 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -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) { - put_net(sock_net(sk)); - sock_net_set(sk, hold_net(net)); + struct net *current_net = sock_net(sk); + + 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) |