projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
net
/
netlink
/
af_netlink.c
diff --git
a/net/netlink/af_netlink.c
b/net/netlink/af_netlink.c
index aea805c98da3ee5b6312277c29c55cf92fc80ae3..a4957bf2ca60d6963e2d94f9b2e7679df3a0b4b6 100644
(file)
--- a/
net/netlink/af_netlink.c
+++ b/
net/netlink/af_netlink.c
@@
-498,7
+498,7
@@
static int netlink_release(struct socket *sock)
skb_queue_purge(&sk->sk_write_queue);
skb_queue_purge(&sk->sk_write_queue);
- if (nlk->pid
&& !nlk->subscriptions
) {
+ if (nlk->pid) {
struct netlink_notify n = {
.net = sock_net(sk),
.protocol = sk->sk_protocol,
struct netlink_notify n = {
.net = sock_net(sk),
.protocol = sk->sk_protocol,
@@
-708,7
+708,7
@@
static int netlink_getname(struct socket *sock, struct sockaddr *addr,
{
struct sock *sk = sock->sk;
struct netlink_sock *nlk = nlk_sk(sk);
{
struct sock *sk = sock->sk;
struct netlink_sock *nlk = nlk_sk(sk);
-
struct sockaddr_nl *nladdr = (struct sockaddr_nl *)addr
;
+
DECLARE_SOCKADDR(struct sockaddr_nl *, nladdr, addr)
;
nladdr->nl_family = AF_NETLINK;
nladdr->nl_pad = 0;
nladdr->nl_family = AF_NETLINK;
nladdr->nl_pad = 0;
@@
-1092,7
+1092,7
@@
static inline int do_one_set_err(struct sock *sk,
if (sk == p->exclude_sk)
goto out;
if (sk == p->exclude_sk)
goto out;
- if (
sock_net(sk) != sock_net(p->exclude_sk
))
+ if (
!net_eq(sock_net(sk), sock_net(p->exclude_sk)
))
goto out;
if (nlk->pid == p->pid || p->group - 1 >= nlk->ngroups ||
goto out;
if (nlk->pid == p->pid || p->group - 1 >= nlk->ngroups ||