Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 315363
b: refs/heads/master
c: 51d7ccc
h: refs/heads/master
i:
  315361: 088217f
  315359: ad66dc0
v: v3
  • Loading branch information
Andrey Vagin authored and David S. Miller committed Jul 17, 2012
1 parent 07cd07c commit 63b5a55
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cbc89c8cf279b85edc95b4ae40a9e7e1edf2dfae
refs/heads/master: 51d7cccf07238f5236c5b9269231a30dd5f8e714
1 change: 0 additions & 1 deletion trunk/include/linux/sock_diag.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,5 @@ void sock_diag_save_cookie(void *sk, __u32 *cookie);

int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attr);

extern struct sock *sock_diag_nlsk;
#endif /* KERNEL */
#endif
1 change: 1 addition & 0 deletions trunk/include/net/net_namespace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ struct net {
struct netns_xfrm xfrm;
#endif
struct netns_ipvs *ipvs;
struct sock *diag_nlsk;
};


Expand Down
27 changes: 20 additions & 7 deletions trunk/net/core/sock_diag.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,23 +166,36 @@ static void sock_diag_rcv(struct sk_buff *skb)
mutex_unlock(&sock_diag_mutex);
}

struct sock *sock_diag_nlsk;
EXPORT_SYMBOL_GPL(sock_diag_nlsk);

static int __init sock_diag_init(void)
static int __net_init diag_net_init(struct net *net)
{
struct netlink_kernel_cfg cfg = {
.input = sock_diag_rcv,
};

sock_diag_nlsk = netlink_kernel_create(&init_net, NETLINK_SOCK_DIAG,
net->diag_nlsk = netlink_kernel_create(net, NETLINK_SOCK_DIAG,
THIS_MODULE, &cfg);
return sock_diag_nlsk == NULL ? -ENOMEM : 0;
return net->diag_nlsk == NULL ? -ENOMEM : 0;
}

static void __net_exit diag_net_exit(struct net *net)
{
netlink_kernel_release(net->diag_nlsk);
net->diag_nlsk = NULL;
}

static struct pernet_operations diag_net_ops = {
.init = diag_net_init,
.exit = diag_net_exit,
};

static int __init sock_diag_init(void)
{
return register_pernet_subsys(&diag_net_ops);
}

static void __exit sock_diag_exit(void)
{
netlink_kernel_release(sock_diag_nlsk);
unregister_pernet_subsys(&diag_net_ops);
}

module_init(sock_diag_init);
Expand Down
21 changes: 16 additions & 5 deletions trunk/net/ipv4/inet_diag.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,16 +272,17 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_s
int err;
struct sock *sk;
struct sk_buff *rep;
struct net *net = sock_net(in_skb->sk);

err = -EINVAL;
if (req->sdiag_family == AF_INET) {
sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0],
sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0],
req->id.idiag_dport, req->id.idiag_src[0],
req->id.idiag_sport, req->id.idiag_if);
}
#if IS_ENABLED(CONFIG_IPV6)
else if (req->sdiag_family == AF_INET6) {
sk = inet6_lookup(&init_net, hashinfo,
sk = inet6_lookup(net, hashinfo,
(struct in6_addr *)req->id.idiag_dst,
req->id.idiag_dport,
(struct in6_addr *)req->id.idiag_src,
Expand Down Expand Up @@ -317,7 +318,7 @@ int inet_diag_dump_one_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *in_s
nlmsg_free(rep);
goto out;
}
err = netlink_unicast(sock_diag_nlsk, rep, NETLINK_CB(in_skb).pid,
err = netlink_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).pid,
MSG_DONTWAIT);
if (err > 0)
err = 0;
Expand Down Expand Up @@ -724,6 +725,7 @@ void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb,
{
int i, num;
int s_i, s_num;
struct net *net = sock_net(skb->sk);

s_i = cb->args[1];
s_num = num = cb->args[2];
Expand All @@ -743,6 +745,9 @@ void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb,
sk_nulls_for_each(sk, node, &ilb->head) {
struct inet_sock *inet = inet_sk(sk);

if (!net_eq(sock_net(sk), net))
continue;

if (num < s_num) {
num++;
continue;
Expand Down Expand Up @@ -813,6 +818,8 @@ void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb,
sk_nulls_for_each(sk, node, &head->chain) {
struct inet_sock *inet = inet_sk(sk);

if (!net_eq(sock_net(sk), net))
continue;
if (num < s_num)
goto next_normal;
if (!(r->idiag_states & (1 << sk->sk_state)))
Expand All @@ -839,6 +846,8 @@ void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb,

inet_twsk_for_each(tw, node,
&head->twchain) {
if (!net_eq(twsk_net(tw), net))
continue;

if (num < s_num)
goto next_dying;
Expand Down Expand Up @@ -943,6 +952,7 @@ static int inet_diag_get_exact_compat(struct sk_buff *in_skb,
static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)
{
int hdrlen = sizeof(struct inet_diag_req);
struct net *net = sock_net(skb->sk);

if (nlh->nlmsg_type >= INET_DIAG_GETSOCK_MAX ||
nlmsg_len(nlh) < hdrlen)
Expand All @@ -963,7 +973,7 @@ static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)
struct netlink_dump_control c = {
.dump = inet_diag_dump_compat,
};
return netlink_dump_start(sock_diag_nlsk, skb, nlh, &c);
return netlink_dump_start(net->diag_nlsk, skb, nlh, &c);
}
}

Expand All @@ -973,6 +983,7 @@ static int inet_diag_rcv_msg_compat(struct sk_buff *skb, struct nlmsghdr *nlh)
static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
{
int hdrlen = sizeof(struct inet_diag_req_v2);
struct net *net = sock_net(skb->sk);

if (nlmsg_len(h) < hdrlen)
return -EINVAL;
Expand All @@ -991,7 +1002,7 @@ static int inet_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
struct netlink_dump_control c = {
.dump = inet_diag_dump,
};
return netlink_dump_start(sock_diag_nlsk, skb, h, &c);
return netlink_dump_start(net->diag_nlsk, skb, h, &c);
}
}

Expand Down
10 changes: 7 additions & 3 deletions trunk/net/ipv4/udp_diag.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,16 @@ static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb,
int err = -EINVAL;
struct sock *sk;
struct sk_buff *rep;
struct net *net = sock_net(in_skb->sk);

if (req->sdiag_family == AF_INET)
sk = __udp4_lib_lookup(&init_net,
sk = __udp4_lib_lookup(net,
req->id.idiag_src[0], req->id.idiag_sport,
req->id.idiag_dst[0], req->id.idiag_dport,
req->id.idiag_if, tbl);
#if IS_ENABLED(CONFIG_IPV6)
else if (req->sdiag_family == AF_INET6)
sk = __udp6_lib_lookup(&init_net,
sk = __udp6_lib_lookup(net,
(struct in6_addr *)req->id.idiag_src,
req->id.idiag_sport,
(struct in6_addr *)req->id.idiag_dst,
Expand Down Expand Up @@ -75,7 +76,7 @@ static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb,
kfree_skb(rep);
goto out;
}
err = netlink_unicast(sock_diag_nlsk, rep, NETLINK_CB(in_skb).pid,
err = netlink_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).pid,
MSG_DONTWAIT);
if (err > 0)
err = 0;
Expand All @@ -90,6 +91,7 @@ static void udp_dump(struct udp_table *table, struct sk_buff *skb, struct netlin
struct inet_diag_req_v2 *r, struct nlattr *bc)
{
int num, s_num, slot, s_slot;
struct net *net = sock_net(skb->sk);

s_slot = cb->args[0];
num = s_num = cb->args[1];
Expand All @@ -106,6 +108,8 @@ static void udp_dump(struct udp_table *table, struct sk_buff *skb, struct netlin
sk_nulls_for_each(sk, node, &hslot->head) {
struct inet_sock *inet = inet_sk(sk);

if (!net_eq(sock_net(sk), net))
continue;
if (num < s_num)
goto next;
if (!(r->idiag_states & (1 << sk->sk_state)))
Expand Down
9 changes: 7 additions & 2 deletions trunk/net/unix/diag.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
{
struct unix_diag_req *req;
int num, s_num, slot, s_slot;
struct net *net = sock_net(skb->sk);

req = nlmsg_data(cb->nlh);

Expand All @@ -192,6 +193,8 @@ static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)

num = 0;
sk_for_each(sk, node, &unix_socket_table[slot]) {
if (!net_eq(sock_net(sk), net))
continue;
if (num < s_num)
goto next;
if (!(req->udiag_states & (1 << sk->sk_state)))
Expand Down Expand Up @@ -243,6 +246,7 @@ static int unix_diag_get_exact(struct sk_buff *in_skb,
struct sock *sk;
struct sk_buff *rep;
unsigned int extra_len;
struct net *net = sock_net(in_skb->sk);

if (req->udiag_ino == 0)
goto out_nosk;
Expand Down Expand Up @@ -273,7 +277,7 @@ static int unix_diag_get_exact(struct sk_buff *in_skb,

goto again;
}
err = netlink_unicast(sock_diag_nlsk, rep, NETLINK_CB(in_skb).pid,
err = netlink_unicast(net->diag_nlsk, rep, NETLINK_CB(in_skb).pid,
MSG_DONTWAIT);
if (err > 0)
err = 0;
Expand All @@ -287,6 +291,7 @@ static int unix_diag_get_exact(struct sk_buff *in_skb,
static int unix_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
{
int hdrlen = sizeof(struct unix_diag_req);
struct net *net = sock_net(skb->sk);

if (nlmsg_len(h) < hdrlen)
return -EINVAL;
Expand All @@ -295,7 +300,7 @@ static int unix_diag_handler_dump(struct sk_buff *skb, struct nlmsghdr *h)
struct netlink_dump_control c = {
.dump = unix_diag_dump,
};
return netlink_dump_start(sock_diag_nlsk, skb, h, &c);
return netlink_dump_start(net->diag_nlsk, skb, h, &c);
} else
return unix_diag_get_exact(skb, h, nlmsg_data(h));
}
Expand Down

0 comments on commit 63b5a55

Please sign in to comment.