Commit d550d095 authored by David S. Miller's avatar David S. Miller
Browse files

netfilter: nfnetlink_log: Move away from NLMSG_PUT(). 



And use nlmsg_data() while we're here too.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2bd4baf

net/netfilter/nfnetlink_log.c

+16 −13
Original line number Original line Diff line number Diff line
@@ -326,18 +326,20 @@ __nfulnl_send(struct nfulnl_instance *inst) 
{

{

	int status = -1;

	int status = -1;





	if (inst->qlen > 1)

	if (inst->qlen > 1) {

		NLMSG_PUT(inst->skb, 0, 0,

		struct nlmsghdr *nlh = nlmsg_put(inst->skb, 0, 0,

						 NLMSG_DONE,

						 NLMSG_DONE,

			  sizeof(struct nfgenmsg));

						 sizeof(struct nfgenmsg),



						 0);

		if (!nlh)

			goto out;

	}

	status = nfnetlink_unicast(inst->skb, &init_net, inst->peer_pid,

	status = nfnetlink_unicast(inst->skb, &init_net, inst->peer_pid,

				   MSG_DONTWAIT);

				   MSG_DONTWAIT);





	inst->qlen = 0;

	inst->qlen = 0;

	inst->skb = NULL;

	inst->skb = NULL;



out:

nlmsg_failure:

	return status;

	return status;

}

}
@@ -380,10 +382,12 @@ __build_packet_message(struct nfulnl_instance *inst, 
	struct nfgenmsg *nfmsg;

	struct nfgenmsg *nfmsg;

	sk_buff_data_t old_tail = inst->skb->tail;

	sk_buff_data_t old_tail = inst->skb->tail;





	nlh = NLMSG_PUT(inst->skb, 0, 0,

	nlh = nlmsg_put(inst->skb, 0, 0,

			NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET,

			NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET,

			sizeof(struct nfgenmsg));

			sizeof(struct nfgenmsg), 0);

	nfmsg = NLMSG_DATA(nlh);

	if (!nlh)

		return -1;

	nfmsg = nlmsg_data(nlh);

	nfmsg->nfgen_family = pf;

	nfmsg->nfgen_family = pf;

	nfmsg->version = NFNETLINK_V0;

	nfmsg->version = NFNETLINK_V0;

	nfmsg->res_id = htons(inst->group_num);

	nfmsg->res_id = htons(inst->group_num);
@@ -526,7 +530,7 @@ __build_packet_message(struct nfulnl_instance *inst, 




		if (skb_tailroom(inst->skb) < nla_total_size(data_len)) {

		if (skb_tailroom(inst->skb) < nla_total_size(data_len)) {

			printk(KERN_WARNING "nfnetlink_log: no tailroom!\n");

			printk(KERN_WARNING "nfnetlink_log: no tailroom!\n");

			goto nlmsg_failure;

			return -1;

		}

		}





		nla = (struct nlattr *)skb_put(inst->skb, nla_total_size(data_len));

		nla = (struct nlattr *)skb_put(inst->skb, nla_total_size(data_len));
@@ -540,7 +544,6 @@ __build_packet_message(struct nfulnl_instance *inst, 
	nlh->nlmsg_len = inst->skb->tail - old_tail;

	nlh->nlmsg_len = inst->skb->tail - old_tail;

	return 0;

	return 0;





nlmsg_failure:

nla_put_failure:

nla_put_failure:

	PRINTR(KERN_ERR "nfnetlink_log: error creating log nlmsg\n");

	PRINTR(KERN_ERR "nfnetlink_log: error creating log nlmsg\n");

	return -1;

	return -1;
@@ -745,7 +748,7 @@ nfulnl_recv_config(struct sock *ctnl, struct sk_buff *skb, 
		   const struct nlmsghdr *nlh,

		   const struct nlmsghdr *nlh,

		   const struct nlattr * const nfula[])

		   const struct nlattr * const nfula[])

{

{

	struct nfgenmsg *nfmsg = NLMSG_DATA(nlh);

	struct nfgenmsg *nfmsg = nlmsg_data(nlh);

	u_int16_t group_num = ntohs(nfmsg->res_id);

	u_int16_t group_num = ntohs(nfmsg->res_id);

	struct nfulnl_instance *inst;

	struct nfulnl_instance *inst;

	struct nfulnl_msg_config_cmd *cmd = NULL;

	struct nfulnl_msg_config_cmd *cmd = NULL;