Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy...

[linux-2.6] / net / ipv4 / raw.c

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index a490a9d54712a53e544205c805362a3b429a3b2c..85c08696abbe40b4a38de040fe59788a5ff4138e 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -558,7 +558,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                }
 
                security_sk_classify_flow(sk, &fl);
-               err = ip_route_output_flow(&rt, &fl, sk, 1);
+               err = ip_route_output_flow(&init_net, &rt, &fl, sk, 1);
        }
        if (err)
                goto done;
@@ -625,7 +625,7 @@ static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 
        if (sk->sk_state != TCP_CLOSE || addr_len < sizeof(struct sockaddr_in))
                goto out;
-       chk_addr_ret = inet_addr_type(&init_net, addr->sin_addr.s_addr);
+       chk_addr_ret = inet_addr_type(sk->sk_net, addr->sin_addr.s_addr);
        ret = -EADDRNOTAVAIL;
        if (addr->sin_addr.s_addr && chk_addr_ret != RTN_LOCAL &&
            chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST)
@@ -860,7 +860,8 @@ static struct sock *raw_get_first(struct seq_file *seq)
                struct hlist_node *node;
 
                sk_for_each(sk, node, &state->h->ht[state->bucket])
-                       if (sk->sk_family == state->family)
+                       if (sk->sk_net == state->p.net &&
+                                       sk->sk_family == state->family)
                                goto found;
        }
        sk = NULL;
@@ -876,7 +877,8 @@ static struct sock *raw_get_next(struct seq_file *seq, struct sock *sk)
                sk = sk_next(sk);
 try_again:
                ;
-       } while (sk && sk->sk_family != state->family);
+       } while (sk && sk->sk_net != state->p.net &&
+                       sk->sk_family != state->family);
 
        if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
                sk = sk_head(&state->h->ht[state->bucket]);
@@ -970,16 +972,18 @@ static const struct seq_operations raw_seq_ops = {
        .show  = raw_seq_show,
 };
 
-int raw_seq_open(struct file *file, struct raw_hashinfo *h,
+int raw_seq_open(struct inode *ino, struct file *file, struct raw_hashinfo *h,
                unsigned short family)
 {
+       int err;
        struct raw_iter_state *i;
 
-       i = __seq_open_private(file, &raw_seq_ops,
+       err = seq_open_net(ino, file, &raw_seq_ops,
                        sizeof(struct raw_iter_state));
-       if (i == NULL)
-               return -ENOMEM;
+       if (err < 0)
+               return err;
 
+       i = raw_seq_private((struct seq_file *)file->private_data);
        i->h = h;
        i->family = family;
        return 0;
@@ -988,7 +992,7 @@ EXPORT_SYMBOL_GPL(raw_seq_open);
 
 static int raw_v4_seq_open(struct inode *inode, struct file *file)
 {
-       return raw_seq_open(file, &raw_v4_hashinfo, PF_INET);
+       return raw_seq_open(inode, file, &raw_v4_hashinfo, PF_INET);
 }
 
 static const struct file_operations raw_seq_fops = {
@@ -996,18 +1000,34 @@ static const struct file_operations raw_seq_fops = {
        .open    = raw_v4_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = seq_release_private,
+       .release = seq_release_net,
 };
 
-int __init raw_proc_init(void)
+static __net_init int raw_init_net(struct net *net)
 {
-       if (!proc_net_fops_create(&init_net, "raw", S_IRUGO, &raw_seq_fops))
+       if (!proc_net_fops_create(net, "raw", S_IRUGO, &raw_seq_fops))
                return -ENOMEM;
+
        return 0;
 }
 
+static __net_exit void raw_exit_net(struct net *net)
+{
+       proc_net_remove(net, "raw");
+}
+
+static __net_initdata struct pernet_operations raw_net_ops = {
+       .init = raw_init_net,
+       .exit = raw_exit_net,
+};
+
+int __init raw_proc_init(void)
+{
+       return register_pernet_subsys(&raw_net_ops);
+}
+
 void __init raw_proc_exit(void)
 {
-       proc_net_remove(&init_net, "raw");
+       unregister_pernet_subsys(&raw_net_ops);
 }
 #endif /* CONFIG_PROC_FS */