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 4e95372a78e7683a597d43eddc0973cff8a58a15..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)
@@ -1003,15 +1003,31 @@ static const struct file_operations raw_seq_fops = {
        .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 */