aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorJesper Dangaard Brouer <brouer@redhat.com>2012-09-26 08:06:11 -0400
committerSimon Horman <horms@verge.net.au>2012-09-27 22:34:00 -0400
commit2fab8917f480942c43275e231c0647838e02dc2b (patch)
treed1dcf7e3c9f84bd16f299740c707dc565d237135 /net/netfilter
parent120b9c14f464c445b20c05e81221ef83fdb5e55e (diff)
ipvs: IPv6 extend ICMPv6 handling for future types
Extend handling of ICMPv6, to all none Informational Messages (via ICMPV6_INFOMSG_MASK). This actually only extend our handling to type ICMPV6_PARAMPROB (Parameter Problem), and future types. Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/ipvs/ip_vs_core.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 4edb65462abe..ebd105c4e0c6 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -950,9 +950,7 @@ static int ip_vs_out_icmp_v6(struct sk_buff *skb, int *related,
950 * this means that some packets will manage to get a long way 950 * this means that some packets will manage to get a long way
951 * down this stack and then be rejected, but that's life. 951 * down this stack and then be rejected, but that's life.
952 */ 952 */
953 if ((ic->icmp6_type != ICMPV6_DEST_UNREACH) && 953 if (ic->icmp6_type & ICMPV6_INFOMSG_MASK) {
954 (ic->icmp6_type != ICMPV6_PKT_TOOBIG) &&
955 (ic->icmp6_type != ICMPV6_TIME_EXCEED)) {
956 *related = 0; 954 *related = 0;
957 return NF_ACCEPT; 955 return NF_ACCEPT;
958 } 956 }
@@ -1498,9 +1496,7 @@ ip_vs_in_icmp_v6(struct sk_buff *skb, int *related, unsigned int hooknum)
1498 * this means that some packets will manage to get a long way 1496 * this means that some packets will manage to get a long way
1499 * down this stack and then be rejected, but that's life. 1497 * down this stack and then be rejected, but that's life.
1500 */ 1498 */
1501 if ((ic->icmp6_type != ICMPV6_DEST_UNREACH) && 1499 if (ic->icmp6_type & ICMPV6_INFOMSG_MASK) {
1502 (ic->icmp6_type != ICMPV6_PKT_TOOBIG) &&
1503 (ic->icmp6_type != ICMPV6_TIME_EXCEED)) {
1504 *related = 0; 1500 *related = 0;
1505 return NF_ACCEPT; 1501 return NF_ACCEPT;
1506 } 1502 }