Skip to contentSkip to conversation

Netfilter updates for stable 3.5

PATCH In review [email protected] 3 participants 4 messages Oct 11, 2012 – Oct 15, 2012

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

PATCH 1/1 Netfilter updates for stable 3.5

From: Pablo Neira Ayuso <[email protected]>

Hi!

The following patchset contain fixes for stable 3.5.

The selected patch is:

2dba62c netfilter: nfnetlink_log: fix NLA_PUT macro removal bug

Please, cherry-pick it. Thanks!

author maintainer
#1 lore raw

PATCH 1/1 netfilter: nfnetlink_log: fix NLA_PUT macro removal bug

From: Patrick McHardy <[email protected]>

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))

---
 net/netfilter/nfnetlink_log.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nfnetlink_log.c +1 -1
index 169ab59..592091c1 100644
@@ -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,
Signature · 1 line
1.7.10.4