Merge davem@master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev

[linux-2.6] / net / xfrm / xfrm_user.c

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index c35b9ea3b62b3eda7808d42961f87a9602cefa46..61339e17a0f5dd52bb3ba69f24b47366833d5dc4 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -322,6 +322,13 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info *
        x->props.family = p->family;
        memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr));
        x->props.flags = p->flags;
+
+       /*
+        * Set inner address family if the KM left it as zero.
+        * See comment in validate_tmpl.
+        */
+       if (!x->sel.family)
+               x->sel.family = p->family;
 }
 
 /*
@@ -674,7 +681,9 @@ static struct sk_buff *xfrm_state_netlink(struct sk_buff *in_skb,
 
 static int build_spdinfo(struct sk_buff *skb, u32 pid, u32 seq, u32 flags)
 {
-       struct xfrm_spdinfo si;
+       struct xfrmk_spdinfo si;
+       struct xfrmu_spdinfo spc;
+       struct xfrmu_spdhinfo sph;
        struct nlmsghdr *nlh;
        u32 *f;
 
@@ -685,23 +694,17 @@ static int build_spdinfo(struct sk_buff *skb, u32 pid, u32 seq, u32 flags)
        f = nlmsg_data(nlh);
        *f = flags;
        xfrm_spd_getinfo(&si);
-
-       if (flags & XFRM_SPD_HMASK)
-               NLA_PUT_U32(skb, XFRMA_SPDHMASK, si.spdhcnt);
-       if (flags & XFRM_SPD_HMAX)
-               NLA_PUT_U32(skb, XFRMA_SPDHMAX, si.spdhmcnt);
-       if (flags & XFRM_SPD_ICNT)
-               NLA_PUT_U32(skb, XFRMA_SPDICNT, si.incnt);
-       if (flags & XFRM_SPD_OCNT)
-               NLA_PUT_U32(skb, XFRMA_SPDOCNT, si.outcnt);
-       if (flags & XFRM_SPD_FCNT)
-               NLA_PUT_U32(skb, XFRMA_SPDFCNT, si.fwdcnt);
-       if (flags & XFRM_SPD_ISCNT)
-               NLA_PUT_U32(skb, XFRMA_SPDISCNT, si.inscnt);
-       if (flags & XFRM_SPD_OSCNT)
-               NLA_PUT_U32(skb, XFRMA_SPDOSCNT, si.inscnt);
-       if (flags & XFRM_SPD_FSCNT)
-               NLA_PUT_U32(skb, XFRMA_SPDFSCNT, si.inscnt);
+       spc.incnt = si.incnt;
+       spc.outcnt = si.outcnt;
+       spc.fwdcnt = si.fwdcnt;
+       spc.inscnt = si.inscnt;
+       spc.outscnt = si.outscnt;
+       spc.fwdscnt = si.fwdscnt;
+       sph.spdhcnt = si.spdhcnt;
+       sph.spdhmcnt = si.spdhmcnt;
+
+       NLA_PUT(skb, XFRMA_SPD_INFO, sizeof(spc), &spc);
+       NLA_PUT(skb, XFRMA_SPD_HINFO, sizeof(sph), &sph);
 
        return nlmsg_end(skb, nlh);
 
@@ -719,23 +722,8 @@ static int xfrm_get_spdinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
        u32 seq = nlh->nlmsg_seq;
        int len = NLMSG_LENGTH(sizeof(u32));
 
-
-       if (*flags & XFRM_SPD_HMASK)
-               len += RTA_SPACE(sizeof(u32));
-       if (*flags & XFRM_SPD_HMAX)
-               len += RTA_SPACE(sizeof(u32));
-       if (*flags & XFRM_SPD_ICNT)
-               len += RTA_SPACE(sizeof(u32));
-       if (*flags & XFRM_SPD_OCNT)
-               len += RTA_SPACE(sizeof(u32));
-       if (*flags & XFRM_SPD_FCNT)
-               len += RTA_SPACE(sizeof(u32));
-       if (*flags & XFRM_SPD_ISCNT)
-               len += RTA_SPACE(sizeof(u32));
-       if (*flags & XFRM_SPD_OSCNT)
-               len += RTA_SPACE(sizeof(u32));
-       if (*flags & XFRM_SPD_FSCNT)
-               len += RTA_SPACE(sizeof(u32));
+       len += RTA_SPACE(sizeof(struct xfrmu_spdinfo));
+       len += RTA_SPACE(sizeof(struct xfrmu_spdhinfo));
 
        r_skb = alloc_skb(len, GFP_ATOMIC);
        if (r_skb == NULL)
@@ -1437,10 +1425,13 @@ static int xfrm_flush_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
        struct km_event c;
        struct xfrm_usersa_flush *p = NLMSG_DATA(nlh);
        struct xfrm_audit audit_info;
+       int err;
 
        audit_info.loginuid = NETLINK_CB(skb).loginuid;
        audit_info.secid = NETLINK_CB(skb).sid;
-       xfrm_state_flush(p->proto, &audit_info);
+       err = xfrm_state_flush(p->proto, &audit_info);
+       if (err)
+               return err;
        c.data.proto = p->proto;
        c.event = nlh->nlmsg_type;
        c.seq = nlh->nlmsg_seq;
@@ -1601,7 +1592,9 @@ static int xfrm_flush_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
 
        audit_info.loginuid = NETLINK_CB(skb).loginuid;
        audit_info.secid = NETLINK_CB(skb).sid;
-       xfrm_policy_flush(type, &audit_info);
+       err = xfrm_policy_flush(type, &audit_info);
+       if (err)
+               return err;
        c.data.type = type;
        c.event = nlh->nlmsg_type;
        c.seq = nlh->nlmsg_seq;