diff options
Diffstat (limited to 'net/netlink')
-rw-r--r-- | net/netlink/af_netlink.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 626a58206298..6b178e1247b5 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
@@ -1396,6 +1396,9 @@ netlink_kernel_create(struct net *net, int unit, unsigned int groups, | |||
1396 | } | 1396 | } |
1397 | netlink_table_ungrab(); | 1397 | netlink_table_ungrab(); |
1398 | 1398 | ||
1399 | /* Do not hold an extra referrence to a namespace as this socket is | ||
1400 | * internal to a namespace and does not prevent it to stop. */ | ||
1401 | put_net(net); | ||
1399 | return sk; | 1402 | return sk; |
1400 | 1403 | ||
1401 | out_sock_release: | 1404 | out_sock_release: |
@@ -1411,7 +1414,19 @@ netlink_kernel_release(struct sock *sk) | |||
1411 | { | 1414 | { |
1412 | if (sk == NULL || sk->sk_socket == NULL) | 1415 | if (sk == NULL || sk->sk_socket == NULL) |
1413 | return; | 1416 | return; |
1417 | |||
1418 | /* | ||
1419 | * Last sock_put should drop referrence to sk->sk_net. It has already | ||
1420 | * been dropped in netlink_kernel_create. Taking referrence to stopping | ||
1421 | * namespace is not an option. | ||
1422 | * Take referrence to a socket to remove it from netlink lookup table | ||
1423 | * _alive_ and after that destroy it in the context of init_net. | ||
1424 | */ | ||
1425 | sock_hold(sk); | ||
1414 | sock_release(sk->sk_socket); | 1426 | sock_release(sk->sk_socket); |
1427 | |||
1428 | sk->sk_net = get_net(&init_net); | ||
1429 | sock_put(sk); | ||
1415 | } | 1430 | } |
1416 | EXPORT_SYMBOL(netlink_kernel_release); | 1431 | EXPORT_SYMBOL(netlink_kernel_release); |
1417 | 1432 | ||