* [PATCH] Netfilter updates for stable 3.5
@ 2012-10-11 10:09 pablo
2012-10-11 10:09 ` [PATCH 1/1] netfilter: nfnetlink_log: fix NLA_PUT macro removal bug pablo
2012-10-11 19:09 ` [PATCH] Netfilter updates for stable 3.5 David Miller
0 siblings, 2 replies; 4+ messages in thread
From: pablo @ 2012-10-11 10:09 UTC (permalink / raw)
To: stable; +Cc: netfilter-devel
From: Pablo Neira Ayuso <pablo@netfilter.org>
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!
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] netfilter: nfnetlink_log: fix NLA_PUT macro removal bug
2012-10-11 10:09 [PATCH] Netfilter updates for stable 3.5 pablo
@ 2012-10-11 10:09 ` pablo
2012-10-11 19:09 ` [PATCH] Netfilter updates for stable 3.5 David Miller
1 sibling, 0 replies; 4+ messages in thread
From: pablo @ 2012-10-11 10:09 UTC (permalink / raw)
To: stable; +Cc: netfilter-devel
From: Patrick McHardy <kaber@trash.net>
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: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nfnetlink_log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 169ab59..592091c1 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -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,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/1] netfilter: nfnetlink_log: fix NLA_PUT macro removal bug
2012-10-11 10:18 pablo
@ 2012-10-11 10:18 ` pablo
0 siblings, 0 replies; 4+ messages in thread
From: pablo @ 2012-10-11 10:18 UTC (permalink / raw)
To: stable; +Cc: netfilter-devel
From: Patrick McHardy <kaber@trash.net>
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: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nfnetlink_log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 169ab59..592091c1 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -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,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Netfilter updates for stable 3.5
2012-10-11 10:09 [PATCH] Netfilter updates for stable 3.5 pablo
2012-10-11 10:09 ` [PATCH 1/1] netfilter: nfnetlink_log: fix NLA_PUT macro removal bug pablo
@ 2012-10-11 19:09 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2012-10-11 19:09 UTC (permalink / raw)
To: pablo; +Cc: stable, netfilter-devel
From: pablo@netfilter.org
Date: Thu, 11 Oct 2012 12:09:53 +0200
> From: Pablo Neira Ayuso <pablo@netfilter.org>
>
> 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!
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-11 19:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-11 10:09 [PATCH] Netfilter updates for stable 3.5 pablo
2012-10-11 10:09 ` [PATCH 1/1] netfilter: nfnetlink_log: fix NLA_PUT macro removal bug pablo
2012-10-11 19:09 ` [PATCH] Netfilter updates for stable 3.5 David Miller
-- strict thread matches above, loose matches on Subject: below --
2012-10-11 10:18 pablo
2012-10-11 10:18 ` [PATCH 1/1] netfilter: nfnetlink_log: fix NLA_PUT macro removal bug pablo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).