Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 06:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[NET]: Make netlink_kernel_release publically available as sk_release_kernel.

Browse Source 
This staff will be needed for non-netlink kernel sockets, which should
also not pin a namespace like tcp_socket and icmp_socket.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2008-02-29 11:18:32 -08:00 committed by David S. Miller
parent 9dfbec1fb2
commit edf0208702
3 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/net/sock.h
View File

@ -850,6 +850,7 @@ extern struct sock *sk_alloc(struct net *net, int family,
gfp_t priority, gfp_t priority,
struct proto *prot); struct proto *prot);
extern void sk_free(struct sock *sk); extern void sk_free(struct sock *sk);
extern void sk_release_kernel(struct sock *sk);
extern struct sock *sk_clone(const struct sock *sk, extern struct sock *sk_clone(const struct sock *sk,
const gfp_t priority); const gfp_t priority);
@ -1333,6 +1334,18 @@ static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_e
} }
#endif #endif
/*
* Kernel sockets, f.e. rtnl or icmp_socket, are a part of a namespace.
* They should not hold a referrence to a namespace in order to allow
* to stop it.
* Sockets after sk_change_net should be released using sk_release_kernel
*/
static inline void sk_change_net(struct sock *sk, struct net *net)
{
put_net(sk->sk_net);
sk->sk_net = net;
}
extern void sock_enable_timestamp(struct sock *sk); extern void sock_enable_timestamp(struct sock *sk);
extern int sock_get_timestamp(struct sock *, struct timeval __user *); extern int sock_get_timestamp(struct sock *, struct timeval __user *);
extern int sock_get_timestampns(struct sock *, struct timespec __user *); extern int sock_get_timestampns(struct sock *, struct timespec __user *);

18
net/core/sock.c
View File

@ -987,6 +987,24 @@ void sk_free(struct sock *sk)
sk_prot_free(sk->sk_prot_creator, sk); sk_prot_free(sk->sk_prot_creator, sk);
} }
/*
* Last sock_put should drop referrence to sk->sk_net. It has already
* been dropped in sk_change_net. Taking referrence to stopping namespace
* is not an option.
* Take referrence to a socket to remove it from hash _alive_ and after that
* destroy it in the context of init_net.
*/
void sk_release_kernel(struct sock *sk)
{
if (sk == NULL || sk->sk_socket == NULL)
return;
sock_hold(sk);
sock_release(sk->sk_socket);
sk->sk_net = get_net(&init_net);
sock_put(sk);
}
struct sock *sk_clone(const struct sock *sk, const gfp_t priority) struct sock *sk_clone(const struct sock *sk, const gfp_t priority)
{ {
struct sock *newsk; struct sock *newsk;

18
net/netlink/af_netlink.c
View File

@ -1372,8 +1372,7 @@ netlink_kernel_create(struct net *net, int unit, unsigned int groups,
goto out_sock_release_nosk; goto out_sock_release_nosk;
sk = sock->sk; sk = sock->sk;
put_net(sk->sk_net); sk_change_net(sk, net);
sk->sk_net = net;
if (groups < 32) if (groups < 32)
groups = 32; groups = 32;
@ -1421,20 +1420,7 @@ EXPORT_SYMBOL(netlink_kernel_create);
void void
netlink_kernel_release(struct sock *sk) netlink_kernel_release(struct sock *sk)
{ {
/* sk_release_kernel(sk);
* Last sock_put should drop referrence to sk->sk_net. It has already
* been dropped in netlink_kernel_create. Taking referrence to stopping
* namespace is not an option.
* Take referrence to a socket to remove it from netlink lookup table
* _alive_ and after that destroy it in the context of init_net.
*/
if (sk == NULL || sk->sk_socket == NULL)
return;
sock_hold(sk);
sock_release(sk->sk_socket);
sk->sk_net = get_net(&init_net);
sock_put(sk);
} }
EXPORT_SYMBOL(netlink_kernel_release); EXPORT_SYMBOL(netlink_kernel_release);