Pull regset into release branch

[linux-2.6] / net / key / af_key.c

diff --git a/net/key/af_key.c b/net/key/af_key.c
index 45c3c27d279ad9b66e92b0771b9342a4840ca4c1..e9ef9af4a53bf5d118882db91a171f9d618f4262 100644 (file)
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1219,7 +1219,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr,
                x->sel.prefixlen_s = addr->sadb_address_prefixlen;
        }
 
-       if (!x->sel.family)
+       if (x->props.mode == XFRM_MODE_TRANSPORT)
                x->sel.family = x->props.family;
 
        if (ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1]) {
@@ -2291,6 +2291,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
        return 0;
 
 out:
+       xp->dead = 1;
        xfrm_policy_destroy(xp);
        return err;
 }
@@ -3734,21 +3735,15 @@ static struct net_proto_family pfkey_family_ops = {
 };
 
 #ifdef CONFIG_PROC_FS
-static int pfkey_read_proc(char *buffer, char **start, off_t offset,
-                          int length, int *eof, void *data)
+static int pfkey_seq_show(struct seq_file *f, void *v)
 {
-       off_t pos = 0;
-       off_t begin = 0;
-       int len = 0;
        struct sock *s;
-       struct hlist_node *node;
-
-       len += sprintf(buffer,"sk       RefCnt Rmem   Wmem   User   Inode\n");
-
-       read_lock(&pfkey_table_lock);
 
-       sk_for_each(s, node, &pfkey_table) {
-               len += sprintf(buffer+len,"%p %-6d %-6u %-6u %-6u %-6lu",
+       s = (struct sock *)v;
+       if (v == SEQ_START_TOKEN)
+               seq_printf(f ,"sk       RefCnt Rmem   Wmem   User   Inode\n");
+       else
+               seq_printf(f ,"%p %-6d %-6u %-6u %-6u %-6lu\n",
                               s,
                               atomic_read(&s->sk_refcnt),
                               atomic_read(&s->sk_rmem_alloc),
@@ -3756,31 +3751,81 @@ static int pfkey_read_proc(char *buffer, char **start, off_t offset,
                               sock_i_uid(s),
                               sock_i_ino(s)
                               );
+       return 0;
+}
 
-               buffer[len++] = '\n';
+static void *pfkey_seq_start(struct seq_file *f, loff_t *ppos)
+{
+       struct sock *s;
+       struct hlist_node *node;
+       loff_t pos = *ppos;
 
-               pos = begin + len;
-               if (pos < offset) {
-                       len = 0;
-                       begin = pos;
-               }
-               if(pos > offset + length)
-                       goto done;
-       }
-       *eof = 1;
+       read_lock(&pfkey_table_lock);
+       if (pos == 0)
+               return SEQ_START_TOKEN;
+
+       sk_for_each(s, node, &pfkey_table)
+               if (pos-- == 1)
+                       return s;
+
+       return NULL;
+}
+
+static void *pfkey_seq_next(struct seq_file *f, void *v, loff_t *ppos)
+{
+       ++*ppos;
+       return (v == SEQ_START_TOKEN) ?
+               sk_head(&pfkey_table) :
+                       sk_next((struct sock *)v);
+}
 
-done:
+static void pfkey_seq_stop(struct seq_file *f, void *v)
+{
        read_unlock(&pfkey_table_lock);
+}
+
+static struct seq_operations pfkey_seq_ops = {
+       .start  = pfkey_seq_start,
+       .next   = pfkey_seq_next,
+       .stop   = pfkey_seq_stop,
+       .show   = pfkey_seq_show,
+};
 
-       *start = buffer + (offset - begin);
-       len -= (offset - begin);
+static int pfkey_seq_open(struct inode *inode, struct file *file)
+{
+       return seq_open(file, &pfkey_seq_ops);
+}
+
+static struct file_operations pfkey_proc_ops = {
+       .open    = pfkey_seq_open,
+       .read    = seq_read,
+       .llseek  = seq_lseek,
+       .release = seq_release,
+};
+
+static int pfkey_init_proc(void)
+{
+       struct proc_dir_entry *e;
 
-       if (len > length)
-               len = length;
-       if (len < 0)
-               len = 0;
+       e = proc_net_fops_create(&init_net, "pfkey", 0, &pfkey_proc_ops);
+       if (e == NULL)
+               return -ENOMEM;
+
+       return 0;
+}
+
+static void pfkey_exit_proc(void)
+{
+       proc_net_remove(&init_net, "pfkey");
+}
+#else
+static inline int pfkey_init_proc(void)
+{
+       return 0;
+}
 
-       return len;
+static inline void pfkey_exit_proc(void)
+{
 }
 #endif
 
@@ -3798,7 +3843,7 @@ static struct xfrm_mgr pfkeyv2_mgr =
 static void __exit ipsec_pfkey_exit(void)
 {
        xfrm_unregister_km(&pfkeyv2_mgr);
-       remove_proc_entry("pfkey", init_net.proc_net);
+       pfkey_exit_proc();
        sock_unregister(PF_KEY);
        proto_unregister(&key_proto);
 }
@@ -3813,21 +3858,17 @@ static int __init ipsec_pfkey_init(void)
        err = sock_register(&pfkey_family_ops);
        if (err != 0)
                goto out_unregister_key_proto;
-#ifdef CONFIG_PROC_FS
-       err = -ENOMEM;
-       if (create_proc_read_entry("pfkey", 0, init_net.proc_net, pfkey_read_proc, NULL) == NULL)
+       err = pfkey_init_proc();
+       if (err != 0)
                goto out_sock_unregister;
-#endif
        err = xfrm_register_km(&pfkeyv2_mgr);
        if (err != 0)
                goto out_remove_proc_entry;
 out:
        return err;
 out_remove_proc_entry:
-#ifdef CONFIG_PROC_FS
-       remove_proc_entry("net/pfkey", NULL);
+       pfkey_exit_proc();
 out_sock_unregister:
-#endif
        sock_unregister(PF_KEY);
 out_unregister_key_proto:
        proto_unregister(&key_proto);