Pull asus into release branch
[pandora-kernel.git] / net / key / af_key.c
index 0e1dbfb..3450193 100644 (file)
@@ -27,6 +27,7 @@
 #include <linux/proc_fs.h>
 #include <linux/init.h>
 #include <net/xfrm.h>
+#include <linux/audit.h>
 
 #include <net/sock.h>
 
@@ -151,7 +152,7 @@ static int pfkey_create(struct socket *sock, int protocol)
        sk = sk_alloc(PF_KEY, GFP_KERNEL, &key_proto, 1);
        if (sk == NULL)
                goto out;
-       
+
        sock->ops = &pfkey_ops;
        sock_init_data(sock, sk);
 
@@ -486,7 +487,7 @@ static int parse_exthdrs(struct sk_buff *skb, struct sadb_msg *hdr, void **ext_h
                            ext_type == SADB_X_EXT_NAT_T_OA) {
                                if (verify_address_len(p))
                                        return -EINVAL;
-                       }                               
+                       }
                        if (ext_type == SADB_X_EXT_SEC_CTX) {
                                if (verify_sec_ctx_len(p))
                                        return -EINVAL;
@@ -555,12 +556,12 @@ static int pfkey_sadb_addr2xfrm_addr(struct sadb_address *addr,
 {
        switch (((struct sockaddr*)(addr + 1))->sa_family) {
        case AF_INET:
-               xaddr->a4 = 
+               xaddr->a4 =
                        ((struct sockaddr_in *)(addr + 1))->sin_addr.s_addr;
                return AF_INET;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
        case AF_INET6:
-               memcpy(xaddr->a6, 
+               memcpy(xaddr->a6,
                       &((struct sockaddr_in6 *)(addr + 1))->sin6_addr,
                       sizeof(struct in6_addr));
                return AF_INET6;
@@ -629,6 +630,35 @@ pfkey_sockaddr_size(sa_family_t family)
        /* NOTREACHED */
 }
 
+static inline int pfkey_mode_from_xfrm(int mode)
+{
+       switch(mode) {
+       case XFRM_MODE_TRANSPORT:
+               return IPSEC_MODE_TRANSPORT;
+       case XFRM_MODE_TUNNEL:
+               return IPSEC_MODE_TUNNEL;
+       case XFRM_MODE_BEET:
+               return IPSEC_MODE_BEET;
+       default:
+               return -1;
+       }
+}
+
+static inline int pfkey_mode_to_xfrm(int mode)
+{
+       switch(mode) {
+       case IPSEC_MODE_ANY:    /*XXX*/
+       case IPSEC_MODE_TRANSPORT:
+               return XFRM_MODE_TRANSPORT;
+       case IPSEC_MODE_TUNNEL:
+               return XFRM_MODE_TUNNEL;
+       case IPSEC_MODE_BEET:
+               return XFRM_MODE_BEET;
+       default:
+               return -1;
+       }
+}
+
 static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys, int hsc)
 {
        struct sk_buff *skb;
@@ -650,6 +680,7 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
        int encrypt_key_size = 0;
        int sockaddr_size;
        struct xfrm_encap_tmpl *natt = NULL;
+       int mode;
 
        /* address family check */
        sockaddr_size = pfkey_sockaddr_size(x->props.family);
@@ -658,11 +689,11 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
 
        /* base, SA, (lifetime (HSC),) address(SD), (address(P),)
           key(AE), (identity(SD),) (sensitivity)> */
-       size = sizeof(struct sadb_msg) +sizeof(struct sadb_sa) + 
+       size = sizeof(struct sadb_msg) +sizeof(struct sadb_sa) +
                sizeof(struct sadb_lifetime) +
                ((hsc & 1) ? sizeof(struct sadb_lifetime) : 0) +
                ((hsc & 2) ? sizeof(struct sadb_lifetime) : 0) +
-                       sizeof(struct sadb_address)*2 + 
+                       sizeof(struct sadb_address)*2 +
                                sockaddr_size*2 +
                                        sizeof(struct sadb_x_sa2);
 
@@ -684,13 +715,13 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
 
        if (add_keys) {
                if (x->aalg && x->aalg->alg_key_len) {
-                       auth_key_size = 
-                               PFKEY_ALIGN8((x->aalg->alg_key_len + 7) / 8); 
+                       auth_key_size =
+                               PFKEY_ALIGN8((x->aalg->alg_key_len + 7) / 8);
                        size += sizeof(struct sadb_key) + auth_key_size;
                }
                if (x->ealg && x->ealg->alg_key_len) {
-                       encrypt_key_size = 
-                               PFKEY_ALIGN8((x->ealg->alg_key_len+7) / 8); 
+                       encrypt_key_size =
+                               PFKEY_ALIGN8((x->ealg->alg_key_len+7) / 8);
                        size += sizeof(struct sadb_key) + encrypt_key_size;
                }
        }
@@ -757,7 +788,7 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
 
        /* hard time */
        if (hsc & 2) {
-               lifetime = (struct sadb_lifetime *)  skb_put(skb, 
+               lifetime = (struct sadb_lifetime *)  skb_put(skb,
                                                             sizeof(struct sadb_lifetime));
                lifetime->sadb_lifetime_len =
                        sizeof(struct sadb_lifetime)/sizeof(uint64_t);
@@ -769,7 +800,7 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
        }
        /* soft time */
        if (hsc & 1) {
-               lifetime = (struct sadb_lifetime *)  skb_put(skb, 
+               lifetime = (struct sadb_lifetime *)  skb_put(skb,
                                                             sizeof(struct sadb_lifetime));
                lifetime->sadb_lifetime_len =
                        sizeof(struct sadb_lifetime)/sizeof(uint64_t);
@@ -790,16 +821,16 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
        lifetime->sadb_lifetime_addtime = x->curlft.add_time;
        lifetime->sadb_lifetime_usetime = x->curlft.use_time;
        /* src address */
-       addr = (struct sadb_address*) skb_put(skb, 
+       addr = (struct sadb_address*) skb_put(skb,
                                              sizeof(struct sadb_address)+sockaddr_size);
-       addr->sadb_address_len = 
+       addr->sadb_address_len =
                (sizeof(struct sadb_address)+sockaddr_size)/
                        sizeof(uint64_t);
        addr->sadb_address_exttype = SADB_EXT_ADDRESS_SRC;
-       /* "if the ports are non-zero, then the sadb_address_proto field, 
-          normally zero, MUST be filled in with the transport 
+       /* "if the ports are non-zero, then the sadb_address_proto field,
+          normally zero, MUST be filled in with the transport
           protocol's number." - RFC2367 */
-       addr->sadb_address_proto = 0; 
+       addr->sadb_address_proto = 0;
        addr->sadb_address_reserved = 0;
        if (x->props.family == AF_INET) {
                addr->sadb_address_prefixlen = 32;
@@ -812,29 +843,29 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
        }
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
        else if (x->props.family == AF_INET6) {
-               addr->sadb_address_prefixlen = 128;
+               addr->sadb_address_prefixlen = 128;
 
                sin6 = (struct sockaddr_in6 *) (addr + 1);
                sin6->sin6_family = AF_INET6;
                sin6->sin6_port = 0;
                sin6->sin6_flowinfo = 0;
-               memcpy(&sin6->sin6_addr, x->props.saddr.a6,
+               memcpy(&sin6->sin6_addr, x->props.saddr.a6,
                       sizeof(struct in6_addr));
                sin6->sin6_scope_id = 0;
-       }
+       }
 #endif
        else
                BUG();
 
        /* dst address */
-       addr = (struct sadb_address*) skb_put(skb, 
+       addr = (struct sadb_address*) skb_put(skb,
                                              sizeof(struct sadb_address)+sockaddr_size);
-       addr->sadb_address_len = 
+       addr->sadb_address_len =
                (sizeof(struct sadb_address)+sockaddr_size)/
                        sizeof(uint64_t);
        addr->sadb_address_exttype = SADB_EXT_ADDRESS_DST;
-       addr->sadb_address_proto = 0; 
-       addr->sadb_address_prefixlen = 32; /* XXX */ 
+       addr->sadb_address_proto = 0;
+       addr->sadb_address_prefixlen = 32; /* XXX */
        addr->sadb_address_reserved = 0;
        if (x->props.family == AF_INET) {
                sin = (struct sockaddr_in *) (addr + 1);
@@ -844,9 +875,9 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
                memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
 
                if (x->sel.saddr.a4 != x->props.saddr.a4) {
-                       addr = (struct sadb_address*) skb_put(skb, 
+                       addr = (struct sadb_address*) skb_put(skb,
                                sizeof(struct sadb_address)+sockaddr_size);
-                       addr->sadb_address_len = 
+                       addr->sadb_address_len =
                                (sizeof(struct sadb_address)+sockaddr_size)/
                                sizeof(uint64_t);
                        addr->sadb_address_exttype = SADB_EXT_ADDRESS_PROXY;
@@ -875,9 +906,9 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
 
                if (memcmp (x->sel.saddr.a6, x->props.saddr.a6,
                            sizeof(struct in6_addr))) {
-                       addr = (struct sadb_address *) skb_put(skb, 
+                       addr = (struct sadb_address *) skb_put(skb,
                                sizeof(struct sadb_address)+sockaddr_size);
-                       addr->sadb_address_len = 
+                       addr->sadb_address_len =
                                (sizeof(struct sadb_address)+sockaddr_size)/
                                sizeof(uint64_t);
                        addr->sadb_address_exttype = SADB_EXT_ADDRESS_PROXY;
@@ -901,7 +932,7 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
 
        /* auth key */
        if (add_keys && auth_key_size) {
-               key = (struct sadb_key *) skb_put(skb, 
+               key = (struct sadb_key *) skb_put(skb,
                                                  sizeof(struct sadb_key)+auth_key_size);
                key->sadb_key_len = (sizeof(struct sadb_key) + auth_key_size) /
                        sizeof(uint64_t);
@@ -912,14 +943,14 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
        }
        /* encrypt key */
        if (add_keys && encrypt_key_size) {
-               key = (struct sadb_key *) skb_put(skb, 
+               key = (struct sadb_key *) skb_put(skb,
                                                  sizeof(struct sadb_key)+encrypt_key_size);
-               key->sadb_key_len = (sizeof(struct sadb_key) + 
+               key->sadb_key_len = (sizeof(struct sadb_key) +
                                     encrypt_key_size) / sizeof(uint64_t);
                key->sadb_key_exttype = SADB_EXT_KEY_ENCRYPT;
                key->sadb_key_bits = x->ealg->alg_key_len;
                key->sadb_key_reserved = 0;
-               memcpy(key + 1, x->ealg->alg_key, 
+               memcpy(key + 1, x->ealg->alg_key,
                       (x->ealg->alg_key_len+7)/8);
        }
 
@@ -927,7 +958,11 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
        sa2 = (struct sadb_x_sa2 *)  skb_put(skb, sizeof(struct sadb_x_sa2));
        sa2->sadb_x_sa2_len = sizeof(struct sadb_x_sa2)/sizeof(uint64_t);
        sa2->sadb_x_sa2_exttype = SADB_X_EXT_SA2;
-       sa2->sadb_x_sa2_mode = x->props.mode + 1;
+       if ((mode = pfkey_mode_from_xfrm(x->props.mode)) < 0) {
+               kfree_skb(skb);
+               return ERR_PTR(-EINVAL);
+       }
+       sa2->sadb_x_sa2_mode = mode;
        sa2->sadb_x_sa2_reserved1 = 0;
        sa2->sadb_x_sa2_reserved2 = 0;
        sa2->sadb_x_sa2_sequence = 0;
@@ -978,17 +1013,17 @@ static struct sk_buff * pfkey_xfrm_state2msg(struct xfrm_state *x, int add_keys,
        return skb;
 }
 
-static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr, 
+static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr,
                                                void **ext_hdrs)
 {
-       struct xfrm_state *x; 
+       struct xfrm_state *x;
        struct sadb_lifetime *lifetime;
        struct sadb_sa *sa;
        struct sadb_key *key;
        struct sadb_x_sec_ctx *sec_ctx;
        uint16_t proto;
        int err;
-       
+
 
        sa = (struct sadb_sa *) ext_hdrs[SADB_EXT_SA-1];
        if (!sa ||
@@ -1021,7 +1056,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr,
    SADB_SASTATE_MATURE and the kernel MUST return an error if this is
    not true.
 
-           However, KAME setkey always uses SADB_SASTATE_LARVAL.
+          However, KAME setkey always uses SADB_SASTATE_LARVAL.
           Hence, we have to _ignore_ sadb_sa_state, which is also reasonable.
         */
        if (sa->sadb_sa_auth > SADB_AALG_MAX ||
@@ -1143,20 +1178,23 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr,
        }
        /* x->algo.flags = sa->sadb_sa_flags; */
 
-       x->props.family = pfkey_sadb_addr2xfrm_addr((struct sadb_address *) ext_hdrs[SADB_EXT_ADDRESS_SRC-1], 
+       x->props.family = pfkey_sadb_addr2xfrm_addr((struct sadb_address *) ext_hdrs[SADB_EXT_ADDRESS_SRC-1],
                                                    &x->props.saddr);
        if (!x->props.family) {
                err = -EAFNOSUPPORT;
                goto out;
        }
-       pfkey_sadb_addr2xfrm_addr((struct sadb_address *) ext_hdrs[SADB_EXT_ADDRESS_DST-1], 
+       pfkey_sadb_addr2xfrm_addr((struct sadb_address *) ext_hdrs[SADB_EXT_ADDRESS_DST-1],
                                  &x->id.daddr);
 
        if (ext_hdrs[SADB_X_EXT_SA2-1]) {
                struct sadb_x_sa2 *sa2 = (void*)ext_hdrs[SADB_X_EXT_SA2-1];
-               x->props.mode = sa2->sadb_x_sa2_mode;
-               if (x->props.mode)
-                       x->props.mode--;
+               int mode = pfkey_mode_to_xfrm(sa2->sadb_x_sa2_mode);
+               if (mode < 0) {
+                       err = -EINVAL;
+                       goto out;
+               }
+               x->props.mode = mode;
                x->props.reqid = sa2->sadb_x_sa2_reqid;
        }
 
@@ -1217,7 +1255,7 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
        struct sadb_address *saddr, *daddr;
        struct sadb_msg *out_hdr;
        struct xfrm_state *x = NULL;
-       u8 mode;
+       int mode;
        u32 reqid;
        u8 proto;
        unsigned short family;
@@ -1232,7 +1270,9 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
                return -EINVAL;
 
        if ((sa2 = ext_hdrs[SADB_X_EXT_SA2-1]) != NULL) {
-               mode = sa2->sadb_x_sa2_mode - 1;
+               mode = pfkey_mode_to_xfrm(sa2->sadb_x_sa2_mode);
+               if (mode < 0)
+                       return -EINVAL;
                reqid = sa2->sadb_x_sa2_reqid;
        } else {
                mode = 0;
@@ -1409,7 +1449,7 @@ static int pfkey_add(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr,
        struct km_event c;
 
        xfrm_probe_algs();
-       
+
        x = pfkey_msg2xfrm_state(hdr, ext_hdrs);
        if (IS_ERR(x))
                return PTR_ERR(x);
@@ -1420,6 +1460,9 @@ static int pfkey_add(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr,
        else
                err = xfrm_state_update(x);
 
+       xfrm_audit_log(audit_get_loginuid(current->audit_context), 0,
+                      AUDIT_MAC_IPSEC_ADDSA, err ? 0 : 1, NULL, x);
+
        if (err < 0) {
                x->km.state = XFRM_STATE_DEAD;
                __xfrm_state_put(x);
@@ -1460,8 +1503,9 @@ static int pfkey_delete(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
                err = -EPERM;
                goto out;
        }
-       
+
        err = xfrm_state_delete(x);
+
        if (err < 0)
                goto out;
 
@@ -1470,6 +1514,8 @@ static int pfkey_delete(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
        c.event = XFRM_MSG_DELSA;
        km_state_notify(x, &c);
 out:
+       xfrm_audit_log(audit_get_loginuid(current->audit_context), 0,
+                      AUDIT_MAC_IPSEC_DELSA, err ? 0 : 1, NULL, x);
        xfrm_state_put(x);
 
        return err;
@@ -1522,13 +1568,13 @@ static struct sk_buff *compose_sadb_supported(struct sadb_msg *orig,
                auth_len *= sizeof(struct sadb_alg);
                auth_len += sizeof(struct sadb_supported);
        }
-       
+
        enc_len = xfrm_count_enc_supported();
        if (enc_len) {
                enc_len *= sizeof(struct sadb_alg);
                enc_len += sizeof(struct sadb_supported);
        }
-       
+
        len = enc_len + auth_len + sizeof(struct sadb_msg);
 
        skb = alloc_skb(len + 16, allocation);
@@ -1597,7 +1643,7 @@ static int pfkey_register(struct sock *sk, struct sk_buff *skb, struct sadb_msg
        }
 
        xfrm_probe_algs();
-       
+
        supp_skb = compose_sadb_supported(hdr, GFP_KERNEL);
        if (!supp_skb) {
                if (hdr->sadb_msg_satype != SADB_SATYPE_UNSPEC)
@@ -1637,12 +1683,15 @@ static int pfkey_flush(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hd
 {
        unsigned proto;
        struct km_event c;
+       struct xfrm_audit audit_info;
 
        proto = pfkey_satype2proto(hdr->sadb_msg_satype);
        if (proto == 0)
                return -EINVAL;
 
-       xfrm_state_flush(proto);
+       audit_info.loginuid = audit_get_loginuid(current->audit_context);
+       audit_info.secid = 0;
+       xfrm_state_flush(proto, &audit_info);
        c.data.proto = proto;
        c.seq = hdr->sadb_msg_seq;
        c.pid = hdr->sadb_msg_pid;
@@ -1746,6 +1795,7 @@ parse_ipsecrequest(struct xfrm_policy *xp, struct sadb_x_ipsecrequest *rq)
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
        struct sockaddr_in6 *sin6;
 #endif
+       int mode;
 
        if (xp->xfrm_nr >= XFRM_MAX_DEPTH)
                return -ELOOP;
@@ -1754,7 +1804,9 @@ parse_ipsecrequest(struct xfrm_policy *xp, struct sadb_x_ipsecrequest *rq)
                return -EINVAL;
 
        t->id.proto = rq->sadb_x_ipsecrequest_proto; /* XXX check proto */
-       t->mode = rq->sadb_x_ipsecrequest_mode-1;
+       if ((mode = pfkey_mode_to_xfrm(rq->sadb_x_ipsecrequest_mode)) < 0)
+               return -EINVAL;
+       t->mode = mode;
        if (rq->sadb_x_ipsecrequest_level == IPSEC_LEVEL_USE)
                t->optional = 1;
        else if (rq->sadb_x_ipsecrequest_level == IPSEC_LEVEL_UNIQUE) {
@@ -1845,7 +1897,7 @@ static int pfkey_xfrm_policy2msg_size(struct xfrm_policy *xp)
 
        return sizeof(struct sadb_msg) +
                (sizeof(struct sadb_lifetime) * 3) +
-               (sizeof(struct sadb_address) * 2) + 
+               (sizeof(struct sadb_address) * 2) +
                (sockaddr_size * 2) +
                sizeof(struct sadb_x_policy) +
                (xp->xfrm_nr * sizeof(struct sadb_x_ipsecrequest)) +
@@ -1867,7 +1919,7 @@ static struct sk_buff * pfkey_xfrm_policy2msg_prep(struct xfrm_policy *xp)
        return skb;
 }
 
-static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, int dir)
+static int pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, int dir)
 {
        struct sadb_msg *hdr;
        struct sadb_address *addr;
@@ -1893,9 +1945,9 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i
        memset(hdr, 0, size);   /* XXX do we need this ? */
 
        /* src address */
-       addr = (struct sadb_address*) skb_put(skb, 
+       addr = (struct sadb_address*) skb_put(skb,
                                              sizeof(struct sadb_address)+sockaddr_size);
-       addr->sadb_address_len = 
+       addr->sadb_address_len =
                (sizeof(struct sadb_address)+sockaddr_size)/
                        sizeof(uint64_t);
        addr->sadb_address_exttype = SADB_EXT_ADDRESS_SRC;
@@ -1925,14 +1977,14 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i
                BUG();
 
        /* dst address */
-       addr = (struct sadb_address*) skb_put(skb, 
+       addr = (struct sadb_address*) skb_put(skb,
                                              sizeof(struct sadb_address)+sockaddr_size);
        addr->sadb_address_len =
                (sizeof(struct sadb_address)+sockaddr_size)/
                        sizeof(uint64_t);
        addr->sadb_address_exttype = SADB_EXT_ADDRESS_DST;
        addr->sadb_address_proto = pfkey_proto_from_xfrm(xp->selector.proto);
-       addr->sadb_address_prefixlen = xp->selector.prefixlen_d; 
+       addr->sadb_address_prefixlen = xp->selector.prefixlen_d;
        addr->sadb_address_reserved = 0;
        if (xp->family == AF_INET) {
                sin = (struct sockaddr_in *) (addr + 1);
@@ -1956,7 +2008,7 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i
                BUG();
 
        /* hard time */
-       lifetime = (struct sadb_lifetime *)  skb_put(skb, 
+       lifetime = (struct sadb_lifetime *)  skb_put(skb,
                                                     sizeof(struct sadb_lifetime));
        lifetime->sadb_lifetime_len =
                sizeof(struct sadb_lifetime)/sizeof(uint64_t);
@@ -1966,7 +2018,7 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i
        lifetime->sadb_lifetime_addtime = xp->lft.hard_add_expires_seconds;
        lifetime->sadb_lifetime_usetime = xp->lft.hard_use_expires_seconds;
        /* soft time */
-       lifetime = (struct sadb_lifetime *)  skb_put(skb, 
+       lifetime = (struct sadb_lifetime *)  skb_put(skb,
                                                     sizeof(struct sadb_lifetime));
        lifetime->sadb_lifetime_len =
                sizeof(struct sadb_lifetime)/sizeof(uint64_t);
@@ -1976,7 +2028,7 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i
        lifetime->sadb_lifetime_addtime = xp->lft.soft_add_expires_seconds;
        lifetime->sadb_lifetime_usetime = xp->lft.soft_use_expires_seconds;
        /* current time */
-       lifetime = (struct sadb_lifetime *)  skb_put(skb, 
+       lifetime = (struct sadb_lifetime *)  skb_put(skb,
                                                     sizeof(struct sadb_lifetime));
        lifetime->sadb_lifetime_len =
                sizeof(struct sadb_lifetime)/sizeof(uint64_t);
@@ -2004,12 +2056,13 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i
                struct sadb_x_ipsecrequest *rq;
                struct xfrm_tmpl *t = xp->xfrm_vec + i;
                int req_size;
+               int mode;
 
                req_size = sizeof(struct sadb_x_ipsecrequest);
                if (t->mode == XFRM_MODE_TUNNEL)
                        req_size += ((t->encap_family == AF_INET ?
-                                    sizeof(struct sockaddr_in) :
-                                    sizeof(struct sockaddr_in6)) * 2);
+                                    sizeof(struct sockaddr_in) :
+                                    sizeof(struct sockaddr_in6)) * 2);
                else
                        size -= 2*socklen;
                rq = (void*)skb_put(skb, req_size);
@@ -2017,7 +2070,9 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i
                memset(rq, 0, sizeof(*rq));
                rq->sadb_x_ipsecrequest_len = req_size;
                rq->sadb_x_ipsecrequest_proto = t->id.proto;
-               rq->sadb_x_ipsecrequest_mode = t->mode+1;
+               if ((mode = pfkey_mode_from_xfrm(t->mode)) < 0)
+                       return -EINVAL;
+               rq->sadb_x_ipsecrequest_mode = mode;
                rq->sadb_x_ipsecrequest_level = IPSEC_LEVEL_REQUIRE;
                if (t->reqid)
                        rq->sadb_x_ipsecrequest_level = IPSEC_LEVEL_UNIQUE;
@@ -2079,6 +2134,8 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i
 
        hdr->sadb_msg_len = size / sizeof(uint64_t);
        hdr->sadb_msg_reserved = atomic_read(&xp->refcnt);
+
+       return 0;
 }
 
 static int key_notify_policy(struct xfrm_policy *xp, int dir, struct km_event *c)
@@ -2092,7 +2149,9 @@ static int key_notify_policy(struct xfrm_policy *xp, int dir, struct km_event *c
                err = PTR_ERR(out_skb);
                goto out;
        }
-       pfkey_xfrm_policy2msg(out_skb, xp, dir);
+       err = pfkey_xfrm_policy2msg(out_skb, xp, dir);
+       if (err < 0)
+               return err;
 
        out_hdr = (struct sadb_msg *) out_skb->data;
        out_hdr->sadb_msg_version = PF_KEY_V2;
@@ -2139,7 +2198,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
                      XFRM_POLICY_BLOCK : XFRM_POLICY_ALLOW);
        xp->priority = pol->sadb_x_policy_priority;
 
-       sa = ext_hdrs[SADB_EXT_ADDRESS_SRC-1], 
+       sa = ext_hdrs[SADB_EXT_ADDRESS_SRC-1],
        xp->family = pfkey_sadb_addr2xfrm_addr(sa, &xp->selector.saddr);
        if (!xp->family) {
                err = -EINVAL;
@@ -2152,7 +2211,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
        if (xp->selector.sport)
                xp->selector.sport_mask = htons(0xffff);
 
-       sa = ext_hdrs[SADB_EXT_ADDRESS_DST-1], 
+       sa = ext_hdrs[SADB_EXT_ADDRESS_DST-1],
        pfkey_sadb_addr2xfrm_addr(sa, &xp->selector.daddr);
        xp->selector.prefixlen_d = sa->sadb_address_prefixlen;
 
@@ -2205,12 +2264,15 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
        err = xfrm_policy_insert(pol->sadb_x_policy_dir-1, xp,
                                 hdr->sadb_msg_type != SADB_X_SPDUPDATE);
 
+       xfrm_audit_log(audit_get_loginuid(current->audit_context), 0,
+                      AUDIT_MAC_IPSEC_ADDSPD, err ? 0 : 1, xp, NULL);
+
        if (err)
                goto out;
 
        if (hdr->sadb_msg_type == SADB_X_SPDUPDATE)
                c.event = XFRM_MSG_UPDPOLICY;
-       else 
+       else
                c.event = XFRM_MSG_NEWPOLICY;
 
        c.seq = hdr->sadb_msg_seq;
@@ -2247,7 +2309,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg
 
        memset(&sel, 0, sizeof(sel));
 
-       sa = ext_hdrs[SADB_EXT_ADDRESS_SRC-1], 
+       sa = ext_hdrs[SADB_EXT_ADDRESS_SRC-1],
        sel.family = pfkey_sadb_addr2xfrm_addr(sa, &sel.saddr);
        sel.prefixlen_s = sa->sadb_address_prefixlen;
        sel.proto = pfkey_proto_to_xfrm(sa->sadb_address_proto);
@@ -2255,7 +2317,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg
        if (sel.sport)
                sel.sport_mask = htons(0xffff);
 
-       sa = ext_hdrs[SADB_EXT_ADDRESS_DST-1], 
+       sa = ext_hdrs[SADB_EXT_ADDRESS_DST-1],
        pfkey_sadb_addr2xfrm_addr(sa, &sel.daddr);
        sel.prefixlen_d = sa->sadb_address_prefixlen;
        sel.proto = pfkey_proto_to_xfrm(sa->sadb_address_proto);
@@ -2280,15 +2342,18 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg
        }
 
        xp = xfrm_policy_bysel_ctx(XFRM_POLICY_TYPE_MAIN, pol->sadb_x_policy_dir-1,
-                                  &sel, tmp.security, 1);
+                                  &sel, tmp.security, 1, &err);
        security_xfrm_policy_free(&tmp);
+
        if (xp == NULL)
                return -ENOENT;
 
-       err = 0;
+       xfrm_audit_log(audit_get_loginuid(current->audit_context), 0,
+                      AUDIT_MAC_IPSEC_DELSPD, err ? 0 : 1, xp, NULL);
 
-       if ((err = security_xfrm_policy_delete(xp)))
+       if (err)
                goto out;
+
        c.seq = hdr->sadb_msg_seq;
        c.pid = hdr->sadb_msg_pid;
        c.event = XFRM_MSG_DELPOLICY;
@@ -2311,7 +2376,9 @@ static int key_pol_get_resp(struct sock *sk, struct xfrm_policy *xp, struct sadb
                err =  PTR_ERR(out_skb);
                goto out;
        }
-       pfkey_xfrm_policy2msg(out_skb, xp, dir);
+       err = pfkey_xfrm_policy2msg(out_skb, xp, dir);
+       if (err < 0)
+               goto out;
 
        out_hdr = (struct sadb_msg *) out_skb->data;
        out_hdr->sadb_msg_version = hdr->sadb_msg_version;
@@ -2327,10 +2394,203 @@ out:
        return err;
 }
 
+#ifdef CONFIG_NET_KEY_MIGRATE
+static int pfkey_sockaddr_pair_size(sa_family_t family)
+{
+       switch (family) {
+       case AF_INET:
+               return PFKEY_ALIGN8(sizeof(struct sockaddr_in) * 2);
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+       case AF_INET6:
+               return PFKEY_ALIGN8(sizeof(struct sockaddr_in6) * 2);
+#endif
+       default:
+               return 0;
+       }
+       /* NOTREACHED */
+}
+
+static int parse_sockaddr_pair(struct sadb_x_ipsecrequest *rq,
+                              xfrm_address_t *saddr, xfrm_address_t *daddr,
+                              u16 *family)
+{
+       struct sockaddr *sa = (struct sockaddr *)(rq + 1);
+       if (rq->sadb_x_ipsecrequest_len <
+           pfkey_sockaddr_pair_size(sa->sa_family))
+               return -EINVAL;
+
+       switch (sa->sa_family) {
+       case AF_INET:
+               {
+                       struct sockaddr_in *sin;
+                       sin = (struct sockaddr_in *)sa;
+                       if ((sin+1)->sin_family != AF_INET)
+                               return -EINVAL;
+                       memcpy(&saddr->a4, &sin->sin_addr, sizeof(saddr->a4));
+                       sin++;
+                       memcpy(&daddr->a4, &sin->sin_addr, sizeof(daddr->a4));
+                       *family = AF_INET;
+                       break;
+               }
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+       case AF_INET6:
+               {
+                       struct sockaddr_in6 *sin6;
+                       sin6 = (struct sockaddr_in6 *)sa;
+                       if ((sin6+1)->sin6_family != AF_INET6)
+                               return -EINVAL;
+                       memcpy(&saddr->a6, &sin6->sin6_addr,
+                              sizeof(saddr->a6));
+                       sin6++;
+                       memcpy(&daddr->a6, &sin6->sin6_addr,
+                              sizeof(daddr->a6));
+                       *family = AF_INET6;
+                       break;
+               }
+#endif
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int ipsecrequests_to_migrate(struct sadb_x_ipsecrequest *rq1, int len,
+                                   struct xfrm_migrate *m)
+{
+       int err;
+       struct sadb_x_ipsecrequest *rq2;
+       int mode;
+
+       if (len <= sizeof(struct sadb_x_ipsecrequest) ||
+           len < rq1->sadb_x_ipsecrequest_len)
+               return -EINVAL;
+
+       /* old endoints */
+       err = parse_sockaddr_pair(rq1, &m->old_saddr, &m->old_daddr,
+                                 &m->old_family);
+       if (err)
+               return err;
+
+       rq2 = (struct sadb_x_ipsecrequest *)((u8 *)rq1 + rq1->sadb_x_ipsecrequest_len);
+       len -= rq1->sadb_x_ipsecrequest_len;
+
+       if (len <= sizeof(struct sadb_x_ipsecrequest) ||
+           len < rq2->sadb_x_ipsecrequest_len)
+               return -EINVAL;
+
+       /* new endpoints */
+       err = parse_sockaddr_pair(rq2, &m->new_saddr, &m->new_daddr,
+                                 &m->new_family);
+       if (err)
+               return err;
+
+       if (rq1->sadb_x_ipsecrequest_proto != rq2->sadb_x_ipsecrequest_proto ||
+           rq1->sadb_x_ipsecrequest_mode != rq2->sadb_x_ipsecrequest_mode ||
+           rq1->sadb_x_ipsecrequest_reqid != rq2->sadb_x_ipsecrequest_reqid)
+               return -EINVAL;
+
+       m->proto = rq1->sadb_x_ipsecrequest_proto;
+       if ((mode = pfkey_mode_to_xfrm(rq1->sadb_x_ipsecrequest_mode)) < 0)
+               return -EINVAL;
+       m->mode = mode;
+       m->reqid = rq1->sadb_x_ipsecrequest_reqid;
+
+       return ((int)(rq1->sadb_x_ipsecrequest_len +
+                     rq2->sadb_x_ipsecrequest_len));
+}
+
+static int pfkey_migrate(struct sock *sk, struct sk_buff *skb,
+                        struct sadb_msg *hdr, void **ext_hdrs)
+{
+       int i, len, ret, err = -EINVAL;
+       u8 dir;
+       struct sadb_address *sa;
+       struct sadb_x_policy *pol;
+       struct sadb_x_ipsecrequest *rq;
+       struct xfrm_selector sel;
+       struct xfrm_migrate m[XFRM_MAX_DEPTH];
+
+       if (!present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC - 1],
+           ext_hdrs[SADB_EXT_ADDRESS_DST - 1]) ||
+           !ext_hdrs[SADB_X_EXT_POLICY - 1]) {
+               err = -EINVAL;
+               goto out;
+       }
+
+       pol = ext_hdrs[SADB_X_EXT_POLICY - 1];
+       if (!pol) {
+               err = -EINVAL;
+               goto out;
+       }
+
+       if (pol->sadb_x_policy_dir >= IPSEC_DIR_MAX) {
+               err = -EINVAL;
+               goto out;
+       }
+
+       dir = pol->sadb_x_policy_dir - 1;
+       memset(&sel, 0, sizeof(sel));
+
+       /* set source address info of selector */
+       sa = ext_hdrs[SADB_EXT_ADDRESS_SRC - 1];
+       sel.family = pfkey_sadb_addr2xfrm_addr(sa, &sel.saddr);
+       sel.prefixlen_s = sa->sadb_address_prefixlen;
+       sel.proto = pfkey_proto_to_xfrm(sa->sadb_address_proto);
+       sel.sport = ((struct sockaddr_in *)(sa + 1))->sin_port;
+       if (sel.sport)
+               sel.sport_mask = ~0;
+
+       /* set destination address info of selector */
+       sa = ext_hdrs[SADB_EXT_ADDRESS_DST - 1],
+       pfkey_sadb_addr2xfrm_addr(sa, &sel.daddr);
+       sel.prefixlen_d = sa->sadb_address_prefixlen;
+       sel.proto = pfkey_proto_to_xfrm(sa->sadb_address_proto);
+       sel.dport = ((struct sockaddr_in *)(sa + 1))->sin_port;
+       if (sel.dport)
+               sel.dport_mask = ~0;
+
+       rq = (struct sadb_x_ipsecrequest *)(pol + 1);
+
+       /* extract ipsecrequests */
+       i = 0;
+       len = pol->sadb_x_policy_len * 8 - sizeof(struct sadb_x_policy);
+
+       while (len > 0 && i < XFRM_MAX_DEPTH) {
+               ret = ipsecrequests_to_migrate(rq, len, &m[i]);
+               if (ret < 0) {
+                       err = ret;
+                       goto out;
+               } else {
+                       rq = (struct sadb_x_ipsecrequest *)((u8 *)rq + ret);
+                       len -= ret;
+                       i++;
+               }
+       }
+
+       if (!i || len > 0) {
+               err = -EINVAL;
+               goto out;
+       }
+
+       return xfrm_migrate(&sel, dir, XFRM_POLICY_TYPE_MAIN, m, i);
+
+ out:
+       return err;
+}
+#else
+static int pfkey_migrate(struct sock *sk, struct sk_buff *skb,
+                        struct sadb_msg *hdr, void **ext_hdrs)
+{
+       return -ENOPROTOOPT;
+}
+#endif
+
+
 static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, void **ext_hdrs)
 {
        unsigned int dir;
-       int err;
+       int err = 0, delete;
        struct sadb_x_policy *pol;
        struct xfrm_policy *xp;
        struct km_event c;
@@ -2342,16 +2602,20 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
        if (dir >= XFRM_POLICY_MAX)
                return -EINVAL;
 
+       delete = (hdr->sadb_msg_type == SADB_X_SPDDELETE2);
        xp = xfrm_policy_byid(XFRM_POLICY_TYPE_MAIN, dir, pol->sadb_x_policy_id,
-                             hdr->sadb_msg_type == SADB_X_SPDDELETE2);
+                             delete, &err);
        if (xp == NULL)
                return -ENOENT;
 
-       err = 0;
+       if (delete) {
+               xfrm_audit_log(audit_get_loginuid(current->audit_context), 0,
+                              AUDIT_MAC_IPSEC_DELSPD, err ? 0 : 1, xp, NULL);
 
-       c.seq = hdr->sadb_msg_seq;
-       c.pid = hdr->sadb_msg_pid;
-       if (hdr->sadb_msg_type == SADB_X_SPDDELETE2) {
+               if (err)
+                       goto out;
+               c.seq = hdr->sadb_msg_seq;
+               c.pid = hdr->sadb_msg_pid;
                c.data.byid = 1;
                c.event = XFRM_MSG_DELPOLICY;
                km_policy_notify(xp, dir, &c);
@@ -2359,6 +2623,7 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
                err = key_pol_get_resp(sk, xp, hdr, dir);
        }
 
+out:
        xfrm_pol_put(xp);
        return err;
 }
@@ -2368,12 +2633,15 @@ static int dump_sp(struct xfrm_policy *xp, int dir, int count, void *ptr)
        struct pfkey_dump_data *data = ptr;
        struct sk_buff *out_skb;
        struct sadb_msg *out_hdr;
+       int err;
 
        out_skb = pfkey_xfrm_policy2msg_prep(xp);
        if (IS_ERR(out_skb))
                return PTR_ERR(out_skb);
 
-       pfkey_xfrm_policy2msg(out_skb, xp, dir);
+       err = pfkey_xfrm_policy2msg(out_skb, xp, dir);
+       if (err < 0)
+               return err;
 
        out_hdr = (struct sadb_msg *) out_skb->data;
        out_hdr->sadb_msg_version = data->hdr->sadb_msg_version;
@@ -2416,8 +2684,11 @@ static int key_notify_policy_flush(struct km_event *c)
 static int pfkey_spdflush(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr, void **ext_hdrs)
 {
        struct km_event c;
+       struct xfrm_audit audit_info;
 
-       xfrm_policy_flush(XFRM_POLICY_TYPE_MAIN);
+       audit_info.loginuid = audit_get_loginuid(current->audit_context);
+       audit_info.secid = 0;
+       xfrm_policy_flush(XFRM_POLICY_TYPE_MAIN, &audit_info);
        c.data.type = XFRM_POLICY_TYPE_MAIN;
        c.event = XFRM_MSG_FLUSHPOLICY;
        c.pid = hdr->sadb_msg_pid;
@@ -2452,6 +2723,7 @@ static pfkey_handler pfkey_funcs[SADB_MAX + 1] = {
        [SADB_X_SPDFLUSH]       = pfkey_spdflush,
        [SADB_X_SPDSETIDX]      = pfkey_spdadd,
        [SADB_X_SPDDELETE2]     = pfkey_spdget,
+       [SADB_X_MIGRATE]        = pfkey_migrate,
 };
 
 static int pfkey_process(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hdr)
@@ -2531,15 +2803,15 @@ static int count_esp_combs(struct xfrm_tmpl *t)
                struct xfrm_algo_desc *ealg = xfrm_ealg_get_byidx(i);
                if (!ealg)
                        break;
-                       
+
                if (!(ealg_tmpl_set(t, ealg) && ealg->available))
                        continue;
-                       
+
                for (k = 1; ; k++) {
                        struct xfrm_algo_desc *aalg = xfrm_aalg_get_byidx(k);
                        if (!aalg)
                                break;
-                               
+
                        if (aalg_tmpl_set(t, aalg) && aalg->available)
                                sz += sizeof(struct sadb_comb);
                }
@@ -2594,10 +2866,10 @@ static void dump_esp_combs(struct sk_buff *skb, struct xfrm_tmpl *t)
                struct xfrm_algo_desc *ealg = xfrm_ealg_get_byidx(i);
                if (!ealg)
                        break;
-       
+
                if (!(ealg_tmpl_set(t, ealg) && ealg->available))
                        continue;
-                       
+
                for (k = 1; ; k++) {
                        struct sadb_comb *c;
                        struct xfrm_algo_desc *aalg = xfrm_aalg_get_byidx(k);
@@ -2729,7 +3001,7 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct
        struct sadb_x_sec_ctx *sec_ctx;
        struct xfrm_sec_ctx *xfrm_ctx;
        int ctx_size = 0;
-       
+
        sockaddr_size = pfkey_sockaddr_size(x->props.family);
        if (!sockaddr_size)
                return -EINVAL;
@@ -2738,7 +3010,7 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct
                (sizeof(struct sadb_address) * 2) +
                (sockaddr_size * 2) +
                sizeof(struct sadb_x_policy);
-       
+
        if (x->id.proto == IPPROTO_AH)
                size += count_ah_combs(t);
        else if (x->id.proto == IPPROTO_ESP)
@@ -2752,7 +3024,7 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct
        skb =  alloc_skb(size + 16, GFP_ATOMIC);
        if (skb == NULL)
                return -ENOMEM;
-       
+
        hdr = (struct sadb_msg *) skb_put(skb, sizeof(struct sadb_msg));
        hdr->sadb_msg_version = PF_KEY_V2;
        hdr->sadb_msg_type = SADB_ACQUIRE;
@@ -2764,9 +3036,9 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct
        hdr->sadb_msg_pid = 0;
 
        /* src address */
-       addr = (struct sadb_address*) skb_put(skb, 
+       addr = (struct sadb_address*) skb_put(skb,
                                              sizeof(struct sadb_address)+sockaddr_size);
-       addr->sadb_address_len = 
+       addr->sadb_address_len =
                (sizeof(struct sadb_address)+sockaddr_size)/
                        sizeof(uint64_t);
        addr->sadb_address_exttype = SADB_EXT_ADDRESS_SRC;
@@ -2796,9 +3068,9 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct
 #endif
        else
                BUG();
-       
+
        /* dst address */
-       addr = (struct sadb_address*) skb_put(skb, 
+       addr = (struct sadb_address*) skb_put(skb,
                                              sizeof(struct sadb_address)+sockaddr_size);
        addr->sadb_address_len =
                (sizeof(struct sadb_address)+sockaddr_size)/
@@ -2807,7 +3079,7 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct
        addr->sadb_address_proto = 0;
        addr->sadb_address_reserved = 0;
        if (x->props.family == AF_INET) {
-               addr->sadb_address_prefixlen = 32; 
+               addr->sadb_address_prefixlen = 32;
 
                sin = (struct sockaddr_in *) (addr + 1);
                sin->sin_family = AF_INET;
@@ -2817,7 +3089,7 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct
        }
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
        else if (x->props.family == AF_INET6) {
-               addr->sadb_address_prefixlen = 128; 
+               addr->sadb_address_prefixlen = 128;
 
                sin6 = (struct sockaddr_in6 *) (addr + 1);
                sin6->sin6_family = AF_INET6;
@@ -2862,7 +3134,7 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct
 }
 
 static struct xfrm_policy *pfkey_compile_policy(struct sock *sk, int opt,
-                                                u8 *data, int len, int *dir)
+                                               u8 *data, int len, int *dir)
 {
        struct xfrm_policy *xp;
        struct sadb_x_policy *pol = (struct sadb_x_policy*)data;
@@ -2981,17 +3253,17 @@ static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr,
         * HDR | SA | ADDRESS_SRC (old addr) | NAT_T_SPORT (old port) |
         * ADDRESS_DST (new addr) | NAT_T_DPORT (new port)
         */
-       
+
        size = sizeof(struct sadb_msg) +
                sizeof(struct sadb_sa) +
                (sizeof(struct sadb_address) * 2) +
                (sockaddr_size * 2) +
                (sizeof(struct sadb_x_nat_t_port) * 2);
-       
+
        skb =  alloc_skb(size + 16, GFP_ATOMIC);
        if (skb == NULL)
                return -ENOMEM;
-       
+
        hdr = (struct sadb_msg *) skb_put(skb, sizeof(struct sadb_msg));
        hdr->sadb_msg_version = PF_KEY_V2;
        hdr->sadb_msg_type = SADB_X_NAT_T_NEW_MAPPING;
@@ -3016,7 +3288,7 @@ static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr,
        /* ADDRESS_SRC (old addr) */
        addr = (struct sadb_address*)
                skb_put(skb, sizeof(struct sadb_address)+sockaddr_size);
-       addr->sadb_address_len = 
+       addr->sadb_address_len =
                (sizeof(struct sadb_address)+sockaddr_size)/
                        sizeof(uint64_t);
        addr->sadb_address_exttype = SADB_EXT_ADDRESS_SRC;
@@ -3057,7 +3329,7 @@ static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr,
        /* ADDRESS_DST (new addr) */
        addr = (struct sadb_address*)
                skb_put(skb, sizeof(struct sadb_address)+sockaddr_size);
-       addr->sadb_address_len = 
+       addr->sadb_address_len =
                (sizeof(struct sadb_address)+sockaddr_size)/
                        sizeof(uint64_t);
        addr->sadb_address_exttype = SADB_EXT_ADDRESS_DST;
@@ -3097,6 +3369,239 @@ static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr,
        return pfkey_broadcast(skb, GFP_ATOMIC, BROADCAST_REGISTERED, NULL);
 }
 
+#ifdef CONFIG_NET_KEY_MIGRATE
+static int set_sadb_address(struct sk_buff *skb, int sasize, int type,
+                           struct xfrm_selector *sel)
+{
+       struct sadb_address *addr;
+       struct sockaddr_in *sin;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+       struct sockaddr_in6 *sin6;
+#endif
+       addr = (struct sadb_address *)skb_put(skb, sizeof(struct sadb_address) + sasize);
+       addr->sadb_address_len = (sizeof(struct sadb_address) + sasize)/8;
+       addr->sadb_address_exttype = type;
+       addr->sadb_address_proto = sel->proto;
+       addr->sadb_address_reserved = 0;
+
+       switch (type) {
+       case SADB_EXT_ADDRESS_SRC:
+               if (sel->family == AF_INET) {
+                       addr->sadb_address_prefixlen = sel->prefixlen_s;
+                       sin = (struct sockaddr_in *)(addr + 1);
+                       sin->sin_family = AF_INET;
+                       memcpy(&sin->sin_addr.s_addr, &sel->saddr,
+                              sizeof(sin->sin_addr.s_addr));
+                       sin->sin_port = 0;
+                       memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
+               }
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+               else if (sel->family == AF_INET6) {
+                       addr->sadb_address_prefixlen = sel->prefixlen_s;
+                       sin6 = (struct sockaddr_in6 *)(addr + 1);
+                       sin6->sin6_family = AF_INET6;
+                       sin6->sin6_port = 0;
+                       sin6->sin6_flowinfo = 0;
+                       sin6->sin6_scope_id = 0;
+                       memcpy(&sin6->sin6_addr.s6_addr, &sel->saddr,
+                              sizeof(sin6->sin6_addr.s6_addr));
+               }
+#endif
+               break;
+       case SADB_EXT_ADDRESS_DST:
+               if (sel->family == AF_INET) {
+                       addr->sadb_address_prefixlen = sel->prefixlen_d;
+                       sin = (struct sockaddr_in *)(addr + 1);
+                       sin->sin_family = AF_INET;
+                       memcpy(&sin->sin_addr.s_addr, &sel->daddr,
+                              sizeof(sin->sin_addr.s_addr));
+                       sin->sin_port = 0;
+                       memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
+               }
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+               else if (sel->family == AF_INET6) {
+                       addr->sadb_address_prefixlen = sel->prefixlen_d;
+                       sin6 = (struct sockaddr_in6 *)(addr + 1);
+                       sin6->sin6_family = AF_INET6;
+                       sin6->sin6_port = 0;
+                       sin6->sin6_flowinfo = 0;
+                       sin6->sin6_scope_id = 0;
+                       memcpy(&sin6->sin6_addr.s6_addr, &sel->daddr,
+                              sizeof(sin6->sin6_addr.s6_addr));
+               }
+#endif
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int set_ipsecrequest(struct sk_buff *skb,
+                           uint8_t proto, uint8_t mode, int level,
+                           uint32_t reqid, uint8_t family,
+                           xfrm_address_t *src, xfrm_address_t *dst)
+{
+       struct sadb_x_ipsecrequest *rq;
+       struct sockaddr_in *sin;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+       struct sockaddr_in6 *sin6;
+#endif
+       int size_req;
+
+       size_req = sizeof(struct sadb_x_ipsecrequest) +
+                  pfkey_sockaddr_pair_size(family);
+
+       rq = (struct sadb_x_ipsecrequest *)skb_put(skb, size_req);
+       memset(rq, 0, size_req);
+       rq->sadb_x_ipsecrequest_len = size_req;
+       rq->sadb_x_ipsecrequest_proto = proto;
+       rq->sadb_x_ipsecrequest_mode = mode;
+       rq->sadb_x_ipsecrequest_level = level;
+       rq->sadb_x_ipsecrequest_reqid = reqid;
+
+       switch (family) {
+       case AF_INET:
+               sin = (struct sockaddr_in *)(rq + 1);
+               sin->sin_family = AF_INET;
+               memcpy(&sin->sin_addr.s_addr, src,
+                      sizeof(sin->sin_addr.s_addr));
+               sin++;
+               sin->sin_family = AF_INET;
+               memcpy(&sin->sin_addr.s_addr, dst,
+                      sizeof(sin->sin_addr.s_addr));
+               break;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+       case AF_INET6:
+               sin6 = (struct sockaddr_in6 *)(rq + 1);
+               sin6->sin6_family = AF_INET6;
+               sin6->sin6_port = 0;
+               sin6->sin6_flowinfo = 0;
+               sin6->sin6_scope_id = 0;
+               memcpy(&sin6->sin6_addr.s6_addr, src,
+                      sizeof(sin6->sin6_addr.s6_addr));
+               sin6++;
+               sin6->sin6_family = AF_INET6;
+               sin6->sin6_port = 0;
+               sin6->sin6_flowinfo = 0;
+               sin6->sin6_scope_id = 0;
+               memcpy(&sin6->sin6_addr.s6_addr, dst,
+                      sizeof(sin6->sin6_addr.s6_addr));
+               break;
+#endif
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_NET_KEY_MIGRATE
+static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
+                             struct xfrm_migrate *m, int num_bundles)
+{
+       int i;
+       int sasize_sel;
+       int size = 0;
+       int size_pol = 0;
+       struct sk_buff *skb;
+       struct sadb_msg *hdr;
+       struct sadb_x_policy *pol;
+       struct xfrm_migrate *mp;
+
+       if (type != XFRM_POLICY_TYPE_MAIN)
+               return 0;
+
+       if (num_bundles <= 0 || num_bundles > XFRM_MAX_DEPTH)
+               return -EINVAL;
+
+       /* selector */
+       sasize_sel = pfkey_sockaddr_size(sel->family);
+       if (!sasize_sel)
+               return -EINVAL;
+       size += (sizeof(struct sadb_address) + sasize_sel) * 2;
+
+       /* policy info */
+       size_pol += sizeof(struct sadb_x_policy);
+
+       /* ipsecrequests */
+       for (i = 0, mp = m; i < num_bundles; i++, mp++) {
+               /* old locator pair */
+               size_pol += sizeof(struct sadb_x_ipsecrequest) +
+                           pfkey_sockaddr_pair_size(mp->old_family);
+               /* new locator pair */
+               size_pol += sizeof(struct sadb_x_ipsecrequest) +
+                           pfkey_sockaddr_pair_size(mp->new_family);
+       }
+
+       size += sizeof(struct sadb_msg) + size_pol;
+
+       /* alloc buffer */
+       skb = alloc_skb(size, GFP_ATOMIC);
+       if (skb == NULL)
+               return -ENOMEM;
+
+       hdr = (struct sadb_msg *)skb_put(skb, sizeof(struct sadb_msg));
+       hdr->sadb_msg_version = PF_KEY_V2;
+       hdr->sadb_msg_type = SADB_X_MIGRATE;
+       hdr->sadb_msg_satype = pfkey_proto2satype(m->proto);
+       hdr->sadb_msg_len = size / 8;
+       hdr->sadb_msg_errno = 0;
+       hdr->sadb_msg_reserved = 0;
+       hdr->sadb_msg_seq = 0;
+       hdr->sadb_msg_pid = 0;
+
+       /* selector src */
+       set_sadb_address(skb, sasize_sel, SADB_EXT_ADDRESS_SRC, sel);
+
+       /* selector dst */
+       set_sadb_address(skb, sasize_sel, SADB_EXT_ADDRESS_DST, sel);
+
+       /* policy information */
+       pol = (struct sadb_x_policy *)skb_put(skb, sizeof(struct sadb_x_policy));
+       pol->sadb_x_policy_len = size_pol / 8;
+       pol->sadb_x_policy_exttype = SADB_X_EXT_POLICY;
+       pol->sadb_x_policy_type = IPSEC_POLICY_IPSEC;
+       pol->sadb_x_policy_dir = dir + 1;
+       pol->sadb_x_policy_id = 0;
+       pol->sadb_x_policy_priority = 0;
+
+       for (i = 0, mp = m; i < num_bundles; i++, mp++) {
+               /* old ipsecrequest */
+               int mode = pfkey_mode_from_xfrm(mp->mode);
+               if (mode < 0)
+                       return -EINVAL;
+               if (set_ipsecrequest(skb, mp->proto, mode,
+                                    (mp->reqid ?  IPSEC_LEVEL_UNIQUE : IPSEC_LEVEL_REQUIRE),
+                                    mp->reqid, mp->old_family,
+                                    &mp->old_saddr, &mp->old_daddr) < 0) {
+                       return -EINVAL;
+               }
+
+               /* new ipsecrequest */
+               if (set_ipsecrequest(skb, mp->proto, mode,
+                                    (mp->reqid ? IPSEC_LEVEL_UNIQUE : IPSEC_LEVEL_REQUIRE),
+                                    mp->reqid, mp->new_family,
+                                    &mp->new_saddr, &mp->new_daddr) < 0) {
+                       return -EINVAL;
+               }
+       }
+
+       /* broadcast migrate message to sockets */
+       pfkey_broadcast(skb, GFP_ATOMIC, BROADCAST_ALL, NULL);
+
+       return 0;
+}
+#else
+static int pfkey_send_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
+                             struct xfrm_migrate *m, int num_bundles)
+{
+       return -ENOPROTOOPT;
+}
+#endif
+
 static int pfkey_sendmsg(struct kiocb *kiocb,
                         struct socket *sock, struct msghdr *msg, size_t len)
 {
@@ -3232,7 +3737,7 @@ static int pfkey_read_proc(char *buffer, char **start, off_t offset,
                               );
 
                buffer[len++] = '\n';
-               
+
                pos = begin + len;
                if (pos < offset) {
                        len = 0;
@@ -3266,6 +3771,7 @@ static struct xfrm_mgr pfkeyv2_mgr =
        .compile_policy = pfkey_compile_policy,
        .new_mapping    = pfkey_send_new_mapping,
        .notify_policy  = pfkey_send_policy_notify,
+       .migrate        = pfkey_send_migrate,
 };
 
 static void __exit ipsec_pfkey_exit(void)