diff options
author | David S. Miller <davem@davemloft.net> | 2012-06-27 00:34:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-27 00:34:03 -0400 |
commit | d550d0958928889fa7978b3e254edcd6c52c3296 (patch) | |
tree | 1b1c651cdb5245f1de74d63bb797bf1958ec13b4 | |
parent | c2bd4baf410dafeba6aff8ca1cae94344551b0a3 (diff) |
netfilter: nfnetlink_log: Move away from NLMSG_PUT().
And use nlmsg_data() while we're here too.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/netfilter/nfnetlink_log.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index 3c3cfc0cc9b5..169ab59ed9d4 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c | |||
@@ -326,18 +326,20 @@ __nfulnl_send(struct nfulnl_instance *inst) | |||
326 | { | 326 | { |
327 | int status = -1; | 327 | int status = -1; |
328 | 328 | ||
329 | if (inst->qlen > 1) | 329 | if (inst->qlen > 1) { |
330 | NLMSG_PUT(inst->skb, 0, 0, | 330 | struct nlmsghdr *nlh = nlmsg_put(inst->skb, 0, 0, |
331 | NLMSG_DONE, | 331 | NLMSG_DONE, |
332 | sizeof(struct nfgenmsg)); | 332 | sizeof(struct nfgenmsg), |
333 | 333 | 0); | |
334 | if (!nlh) | ||
335 | goto out; | ||
336 | } | ||
334 | status = nfnetlink_unicast(inst->skb, &init_net, inst->peer_pid, | 337 | status = nfnetlink_unicast(inst->skb, &init_net, inst->peer_pid, |
335 | MSG_DONTWAIT); | 338 | MSG_DONTWAIT); |
336 | 339 | ||
337 | inst->qlen = 0; | 340 | inst->qlen = 0; |
338 | inst->skb = NULL; | 341 | inst->skb = NULL; |
339 | 342 | out: | |
340 | nlmsg_failure: | ||
341 | return status; | 343 | return status; |
342 | } | 344 | } |
343 | 345 | ||
@@ -380,10 +382,12 @@ __build_packet_message(struct nfulnl_instance *inst, | |||
380 | struct nfgenmsg *nfmsg; | 382 | struct nfgenmsg *nfmsg; |
381 | sk_buff_data_t old_tail = inst->skb->tail; | 383 | sk_buff_data_t old_tail = inst->skb->tail; |
382 | 384 | ||
383 | nlh = NLMSG_PUT(inst->skb, 0, 0, | 385 | nlh = nlmsg_put(inst->skb, 0, 0, |
384 | NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET, | 386 | NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET, |
385 | sizeof(struct nfgenmsg)); | 387 | sizeof(struct nfgenmsg), 0); |
386 | nfmsg = NLMSG_DATA(nlh); | 388 | if (!nlh) |
389 | return -1; | ||
390 | nfmsg = nlmsg_data(nlh); | ||
387 | nfmsg->nfgen_family = pf; | 391 | nfmsg->nfgen_family = pf; |
388 | nfmsg->version = NFNETLINK_V0; | 392 | nfmsg->version = NFNETLINK_V0; |
389 | nfmsg->res_id = htons(inst->group_num); | 393 | nfmsg->res_id = htons(inst->group_num); |
@@ -526,7 +530,7 @@ __build_packet_message(struct nfulnl_instance *inst, | |||
526 | 530 | ||
527 | if (skb_tailroom(inst->skb) < nla_total_size(data_len)) { | 531 | if (skb_tailroom(inst->skb) < nla_total_size(data_len)) { |
528 | printk(KERN_WARNING "nfnetlink_log: no tailroom!\n"); | 532 | printk(KERN_WARNING "nfnetlink_log: no tailroom!\n"); |
529 | goto nlmsg_failure; | 533 | return -1; |
530 | } | 534 | } |
531 | 535 | ||
532 | nla = (struct nlattr *)skb_put(inst->skb, nla_total_size(data_len)); | 536 | nla = (struct nlattr *)skb_put(inst->skb, nla_total_size(data_len)); |
@@ -540,7 +544,6 @@ __build_packet_message(struct nfulnl_instance *inst, | |||
540 | nlh->nlmsg_len = inst->skb->tail - old_tail; | 544 | nlh->nlmsg_len = inst->skb->tail - old_tail; |
541 | return 0; | 545 | return 0; |
542 | 546 | ||
543 | nlmsg_failure: | ||
544 | nla_put_failure: | 547 | nla_put_failure: |
545 | PRINTR(KERN_ERR "nfnetlink_log: error creating log nlmsg\n"); | 548 | PRINTR(KERN_ERR "nfnetlink_log: error creating log nlmsg\n"); |
546 | return -1; | 549 | return -1; |
@@ -745,7 +748,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb, | |||
745 | const struct nlmsghdr *nlh, | 748 | const struct nlmsghdr *nlh, |
746 | const struct nlattr * const nfula[]) | 749 | const struct nlattr * const nfula[]) |
747 | { | 750 | { |
748 | struct nfgenmsg *nfmsg = NLMSG_DATA(nlh); | 751 | struct nfgenmsg *nfmsg = nlmsg_data(nlh); |
749 | u_int16_t group_num = ntohs(nfmsg->res_id); | 752 | u_int16_t group_num = ntohs(nfmsg->res_id); |
750 | struct nfulnl_instance *inst; | 753 | struct nfulnl_instance *inst; |
751 | struct nfulnl_msg_config_cmd *cmd = NULL; | 754 | struct nfulnl_msg_config_cmd *cmd = NULL; |