* [patch 39/47] netfilter: fix tuple inversion for Node information request
[not found] ` <20090214005726.GA11282@kroah.com>
@ 2009-02-14 0:59 ` Greg KH
2009-02-14 0:59 ` [patch 40/47] netfilter: xt_sctp: sctp chunk mapping doesnt work Greg KH
1 sibling, 0 replies; 2+ messages in thread
From: Greg KH @ 2009-02-14 0:59 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap,
Dave Jones, Chuck Wolber, Chris Wedgwood, Michael Krufky,
Chuck Ebbert, Domenico Andreoli, Willy Tarreau,
Rodrigo Rubira Branco, Jake Edge, Eugene Teo, torvalds, akpm,
alan, netdev, netfilter-devel, Patrick McHardy, davem,
Eric Leblond
[-- Attachment #1: netfilter-fix-tuple-inversion-for-node-information-request.patch --]
[-- Type: text/plain, Size: 1309 bytes --]
2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------
From: Eric Leblond <eric@inl.fr>
netfilter: fix tuple inversion for Node information request
Upstream commit: a51f42f3c
The patch fixes a typo in the inverse mapping of Node Information
request. Following draft-ietf-ipngwg-icmp-name-lookups-09, "Querier"
sends a type 139 (ICMPV6_NI_QUERY) packet to "Responder" which answer
with a type 140 (ICMPV6_NI_REPLY) packet.
Signed-off-by: Eric Leblond <eric@inl.fr>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
@@ -49,8 +49,8 @@ static bool icmpv6_pkt_to_tuple(const st
static const u_int8_t invmap[] = {
[ICMPV6_ECHO_REQUEST - 128] = ICMPV6_ECHO_REPLY + 1,
[ICMPV6_ECHO_REPLY - 128] = ICMPV6_ECHO_REQUEST + 1,
- [ICMPV6_NI_QUERY - 128] = ICMPV6_NI_QUERY + 1,
- [ICMPV6_NI_REPLY - 128] = ICMPV6_NI_REPLY +1
+ [ICMPV6_NI_QUERY - 128] = ICMPV6_NI_REPLY + 1,
+ [ICMPV6_NI_REPLY - 128] = ICMPV6_NI_QUERY +1
};
static bool icmpv6_invert_tuple(struct nf_conntrack_tuple *tuple,
^ permalink raw reply [flat|nested] 2+ messages in thread* [patch 40/47] netfilter: xt_sctp: sctp chunk mapping doesnt work
[not found] ` <20090214005726.GA11282@kroah.com>
2009-02-14 0:59 ` [patch 39/47] netfilter: fix tuple inversion for Node information request Greg KH
@ 2009-02-14 0:59 ` Greg KH
1 sibling, 0 replies; 2+ messages in thread
From: Greg KH @ 2009-02-14 0:59 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Justin Forbes, Zwane Mwaikambo, Theodore Ts'o, Randy Dunlap,
Dave Jones, Chuck Wolber, Chris Wedgwood, Michael Krufky,
Chuck Ebbert, Domenico Andreoli, Willy Tarreau,
Rodrigo Rubira Branco, Jake Edge, Eugene Teo, torvalds, akpm,
alan, netdev, netfilter-devel, Patrick McHardy, davem, Qu Haoran,
Nicolas Dichtel
[-- Attachment #1: netfilter-xt_sctp-sctp-chunk-mapping-doesn-t-work.patch --]
[-- Type: text/plain, Size: 1026 bytes --]
2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------
From: Qu Haoran <haoran.qu@6wind.com>
netfilter: xt_sctp: sctp chunk mapping doesn't work
Upstream commit: d4e2675a
When user tries to map all chunks given in argument, kernel
works on a copy of the chunkmap, but at the end it doesn't
check the copy, but the orginal one.
Signed-off-by: Qu Haoran <haoran.qu@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
net/netfilter/xt_sctp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/netfilter/xt_sctp.c
+++ b/net/netfilter/xt_sctp.c
@@ -105,7 +105,7 @@ match_packet(const struct sk_buff *skb,
switch (chunk_match_type) {
case SCTP_CHUNK_MATCH_ALL:
- return SCTP_CHUNKMAP_IS_CLEAR(info->chunkmap);
+ return SCTP_CHUNKMAP_IS_CLEAR(chunkmapcopy);
case SCTP_CHUNK_MATCH_ANY:
return false;
case SCTP_CHUNK_MATCH_ONLY:
^ permalink raw reply [flat|nested] 2+ messages in thread