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

Commit 2dba62c3 authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: nfnetlink_log: fix NLA_PUT macro removal bug 



Commit 1db20a52 (nfnetlink_log: Stop using NLA_PUT*().) incorrectly
converted a NLA_PUT_BE16 macro to nla_put_be32() in nfnetlink_log:

-               NLA_PUT_BE16(inst->skb, NFULA_HWTYPE, htons(skb->dev->type));
+               if (nla_put_be32(inst->skb, NFULA_HWTYPE, htons(skb->dev->type))

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent fae6ef87

net/netfilter/nfnetlink_log.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ __build_packet_message(struct nfulnl_instance *inst, 
	}



	if (indev && skb_mac_header_was_set(skb)) {

		if (nla_put_be32(inst->skb, NFULA_HWTYPE, htons(skb->dev->type)) ||

		if (nla_put_be16(inst->skb, NFULA_HWTYPE, htons(skb->dev->type)) ||

		    nla_put_be16(inst->skb, NFULA_HWLEN,

				 htons(skb->dev->hard_header_len)) ||

		    nla_put(inst->skb, NFULA_HWHEADER, skb->dev->hard_header_len,