[XFRM] netlink: Use nlmsg_put() instead of NLMSG_PUT()

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 61339e1..ec480b6 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -588,10 +588,10 @@ static int dump_one_state(struct xfrm_state *x, int count, void *ptr)
        if (sp->this_idx < sp->start_idx)
                goto out;
 
-       nlh = NLMSG_PUT(skb, NETLINK_CB(in_skb).pid,
-                       sp->nlmsg_seq,
-                       XFRM_MSG_NEWSA, sizeof(*p));
-       nlh->nlmsg_flags = sp->nlmsg_flags;
+       nlh = nlmsg_put(skb, NETLINK_CB(in_skb).pid, sp->nlmsg_seq,
+                       XFRM_MSG_NEWSA, sizeof(*p), sp->nlmsg_flags);
+       if (nlh == NULL)
+               return -EMSGSIZE;
 
        p = NLMSG_DATA(nlh);
        copy_to_user_state(x, p);
@@ -633,7 +633,6 @@ out:
        sp->this_idx++;
        return 0;
 
-nlmsg_failure:
 rtattr_failure:
        nlmsg_trim(skb, b);
        return -1;
@@ -1276,11 +1275,11 @@ static int dump_one_policy(struct xfrm_policy *xp, int dir, int count, void *ptr
        if (sp->this_idx < sp->start_idx)
                goto out;
 
-       nlh = NLMSG_PUT(skb, NETLINK_CB(in_skb).pid,
-                       sp->nlmsg_seq,
-                       XFRM_MSG_NEWPOLICY, sizeof(*p));
+       nlh = nlmsg_put(skb, NETLINK_CB(in_skb).pid, sp->nlmsg_seq,
+                       XFRM_MSG_NEWPOLICY, sizeof(*p), sp->nlmsg_flags);
+       if (nlh == NULL)
+               return -EMSGSIZE;
        p = NLMSG_DATA(nlh);
-       nlh->nlmsg_flags = sp->nlmsg_flags;
 
        copy_to_user_policy(xp, p, dir);
        if (copy_to_user_tmpl(xp, skb) < 0)
@@ -1449,9 +1448,10 @@ static int build_aevent(struct sk_buff *skb, struct xfrm_state *x, struct km_eve
        struct xfrm_lifetime_cur ltime;
        unsigned char *b = skb_tail_pointer(skb);
 
-       nlh = NLMSG_PUT(skb, c->pid, c->seq, XFRM_MSG_NEWAE, sizeof(*id));
+       nlh = nlmsg_put(skb, c->pid, c->seq, XFRM_MSG_NEWAE, sizeof(*id), 0);
+       if (nlh == NULL)
+               return -EMSGSIZE;
        id = NLMSG_DATA(nlh);
-       nlh->nlmsg_flags = 0;
 
        memcpy(&id->sa_id.daddr, &x->id.daddr,sizeof(x->id.daddr));
        id->sa_id.spi = x->id.spi;
@@ -1483,7 +1483,6 @@ static int build_aevent(struct sk_buff *skb, struct xfrm_state *x, struct km_eve
        return skb->len;
 
 rtattr_failure:
-nlmsg_failure:
        nlmsg_trim(skb, b);
        return -1;
 }
@@ -1866,9 +1865,10 @@ static int build_migrate(struct sk_buff *skb, struct xfrm_migrate *m,
        unsigned char *b = skb_tail_pointer(skb);
        int i;
 
-       nlh = NLMSG_PUT(skb, 0, 0, XFRM_MSG_MIGRATE, sizeof(*pol_id));
+       nlh = nlmsg_put(skb, 0, 0, XFRM_MSG_MIGRATE, sizeof(*pol_id), 0);
+       if (nlh == NULL)
+               return -EMSGSIZE;
        pol_id = NLMSG_DATA(nlh);
-       nlh->nlmsg_flags = 0;
 
        /* copy data from selector, dir, and type to the pol_id */
        memset(pol_id, 0, sizeof(*pol_id));
@@ -2045,20 +2045,16 @@ static int build_expire(struct sk_buff *skb, struct xfrm_state *x, struct km_eve
        struct nlmsghdr *nlh;
        unsigned char *b = skb_tail_pointer(skb);
 
-       nlh = NLMSG_PUT(skb, c->pid, 0, XFRM_MSG_EXPIRE,
-                       sizeof(*ue));
+       nlh = nlmsg_put(skb, c->pid, 0, XFRM_MSG_EXPIRE, sizeof(*ue), 0);
+       if (nlh == NULL)
+               return -EMSGSIZE;
        ue = NLMSG_DATA(nlh);
-       nlh->nlmsg_flags = 0;
 
        copy_to_user_state(x, &ue->state);
        ue->hard = (c->data.hard != 0) ? 1 : 0;
 
        nlh->nlmsg_len = skb_tail_pointer(skb) - b;
        return skb->len;
-
-nlmsg_failure:
-       nlmsg_trim(skb, b);
-       return -1;
 }
 
 static int xfrm_exp_state_notify(struct xfrm_state *x, struct km_event *c)
@@ -2108,9 +2104,11 @@ static int xfrm_notify_sa_flush(struct km_event *c)
                return -ENOMEM;
        b = skb->tail;
 
-       nlh = NLMSG_PUT(skb, c->pid, c->seq,
-                       XFRM_MSG_FLUSHSA, sizeof(*p));
-       nlh->nlmsg_flags = 0;
+       nlh = nlmsg_put(skb, c->pid, c->seq, XFRM_MSG_FLUSHSA, sizeof(*p), 0);
+       if (nlh == NULL) {
+               kfree_skb(skb);
+               return -EMSGSIZE;
+       }
 
        p = NLMSG_DATA(nlh);
        p->proto = c->data.proto;
@@ -2119,10 +2117,6 @@ static int xfrm_notify_sa_flush(struct km_event *c)
 
        NETLINK_CB(skb).dst_group = XFRMNLGRP_SA;
        return netlink_broadcast(xfrm_nl, skb, 0, XFRMNLGRP_SA, GFP_ATOMIC);
-
-nlmsg_failure:
-       kfree_skb(skb);
-       return -1;
 }
 
 static inline int xfrm_sa_len(struct xfrm_state *x)
@@ -2162,8 +2156,9 @@ static int xfrm_notify_sa(struct xfrm_state *x, struct km_event *c)
                return -ENOMEM;
        b = skb->tail;
 
-       nlh = NLMSG_PUT(skb, c->pid, c->seq, c->event, headlen);
-       nlh->nlmsg_flags = 0;
+       nlh = nlmsg_put(skb, c->pid, c->seq, c->event, headlen, 0);
+       if (nlh == NULL)
+               goto nlmsg_failure;
 
        p = NLMSG_DATA(nlh);
        if (c->event == XFRM_MSG_DELSA) {
@@ -2233,10 +2228,10 @@ static int build_acquire(struct sk_buff *skb, struct xfrm_state *x,
        unsigned char *b = skb_tail_pointer(skb);
        __u32 seq = xfrm_get_acqseq();
 
-       nlh = NLMSG_PUT(skb, 0, 0, XFRM_MSG_ACQUIRE,
-                       sizeof(*ua));
+       nlh = nlmsg_put(skb, 0, 0, XFRM_MSG_ACQUIRE, sizeof(*ua), 0);
+       if (nlh == NULL)
+               return -EMSGSIZE;
        ua = NLMSG_DATA(nlh);
-       nlh->nlmsg_flags = 0;
 
        memcpy(&ua->id, &x->id, sizeof(ua->id));
        memcpy(&ua->saddr, &x->props.saddr, sizeof(ua->saddr));
@@ -2352,9 +2347,10 @@ static int build_polexpire(struct sk_buff *skb, struct xfrm_policy *xp,
        int hard = c->data.hard;
        unsigned char *b = skb_tail_pointer(skb);
 
-       nlh = NLMSG_PUT(skb, c->pid, 0, XFRM_MSG_POLEXPIRE, sizeof(*upe));
+       nlh = nlmsg_put(skb, c->pid, 0, XFRM_MSG_POLEXPIRE, sizeof(*upe), 0);
+       if (nlh == NULL)
+               return -EMSGSIZE;
        upe = NLMSG_DATA(nlh);
-       nlh->nlmsg_flags = 0;
 
        copy_to_user_policy(xp, &upe->pol, dir);
        if (copy_to_user_tmpl(xp, skb) < 0)
@@ -2420,7 +2416,9 @@ static int xfrm_notify_policy(struct xfrm_policy *xp, int dir, struct km_event *
                return -ENOMEM;
        b = skb->tail;
 
-       nlh = NLMSG_PUT(skb, c->pid, c->seq, c->event, headlen);
+       nlh = nlmsg_put(skb, c->pid, c->seq, c->event, headlen, 0);
+       if (nlh == NULL)
+               goto nlmsg_failure;
 
        p = NLMSG_DATA(nlh);
        if (c->event == XFRM_MSG_DELPOLICY) {
@@ -2435,8 +2433,6 @@ static int xfrm_notify_policy(struct xfrm_policy *xp, int dir, struct km_event *
                p = RTA_DATA(__RTA_PUT(skb, XFRMA_POLICY, sizeof(*p)));
        }
 
-       nlh->nlmsg_flags = 0;
-
        copy_to_user_policy(xp, p, dir);
        if (copy_to_user_tmpl(xp, skb) < 0)
                goto nlmsg_failure;
@@ -2471,8 +2467,9 @@ static int xfrm_notify_policy_flush(struct km_event *c)
        b = skb->tail;
 
 
-       nlh = NLMSG_PUT(skb, c->pid, c->seq, XFRM_MSG_FLUSHPOLICY, 0);
-       nlh->nlmsg_flags = 0;
+       nlh = nlmsg_put(skb, c->pid, c->seq, XFRM_MSG_FLUSHPOLICY, 0, 0);
+       if (nlh == NULL)
+               goto nlmsg_failure;
        if (copy_to_user_policy_type(c->data.type, skb) < 0)
                goto nlmsg_failure;
 
@@ -2513,9 +2510,10 @@ static int build_report(struct sk_buff *skb, u8 proto,
        struct nlmsghdr *nlh;
        unsigned char *b = skb_tail_pointer(skb);
 
-       nlh = NLMSG_PUT(skb, 0, 0, XFRM_MSG_REPORT, sizeof(*ur));
+       nlh = nlmsg_put(skb, 0, 0, XFRM_MSG_REPORT, sizeof(*ur), 0);
+       if (nlh == NULL)
+               return -EMSGSIZE;
        ur = NLMSG_DATA(nlh);
-       nlh->nlmsg_flags = 0;
 
        ur->proto = proto;
        memcpy(&ur->sel, sel, sizeof(ur->sel));
@@ -2526,7 +2524,6 @@ static int build_report(struct sk_buff *skb, u8 proto,
        nlh->nlmsg_len = skb_tail_pointer(skb) - b;
        return skb->len;
 
-nlmsg_failure:
 rtattr_failure:
        nlmsg_trim(skb, b);
        return -1;