Netfilter updates for stable 3.5
Subsystems (2)
[email protected]
maintainerPATCH 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!
[email protected]
maintainerPATCH 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
@@ -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
From: [email protected]
Date: Thu, 11 Oct 2012 12:09:53 +0200
Quoted 11 lines
From: Pablo Neira Ayuso <[email protected]>
Hi!
The following patchset contain fixes for stable 3.5.
The selected patch is:
2dba62c netfilter:
nfnetlink_log: fixNLA_PUTmacro removal bugPlease, cherry-pick it. Thanks!