Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

netfilter: ipt_ULOG: 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 d106352d

net/ipv4/netfilter/ipt_ULOG.c

+8 −7
Original line number Diff line number Diff line
@@ -196,12 +196,15 @@ static void ipt_ulog_packet(unsigned int hooknum, 


	pr_debug("qlen %d, qthreshold %Zu\n", ub->qlen, loginfo->qthreshold);



	/* NLMSG_PUT contains a hidden goto nlmsg_failure !!! */

	nlh = NLMSG_PUT(ub->skb, 0, ub->qlen, ULOG_NL_EVENT,

			sizeof(*pm)+copy_len);

	nlh = nlmsg_put(ub->skb, 0, ub->qlen, ULOG_NL_EVENT,

			sizeof(*pm)+copy_len, 0);

	if (!nlh) {

		pr_debug("error during nlmsg_put\n");

		goto out_unlock;

	}

	ub->qlen++;



	pm = NLMSG_DATA(nlh);

	pm = nlmsg_data(nlh);



	/* We might not have a timestamp, get one */

	if (skb->tstamp.tv64 == 0)
@@ -261,13 +264,11 @@ static void ipt_ulog_packet(unsigned int hooknum, 
			nlh->nlmsg_type = NLMSG_DONE;

		ulog_send(groupnum);

	}



out_unlock:

	spin_unlock_bh(&ulog_lock);



	return;



nlmsg_failure:

	pr_debug("error during NLMSG_PUT\n");

alloc_failure:

	pr_debug("Error building netlink message\n");

	spin_unlock_bh(&ulog_lock);