Skip to contentSkip to conversation

netfilter: ipv6: icmpv6_manip_pkt comparing codes to types

PATCH Applied Phil Oester 2 participants 2 messages Sep 13, 2013 – Sep 14, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 netfilter: ipv6: icmpv6_manip_pkt comparing codes to types

In commit 58a317f1 (netfilter: ipv6: add IPv6 NAT support), icmpv6_manip_pkt was added with an incorrect comparison of ICMP codes to types. This causes problems when using NAT rules with the --random option. Correct the comparison.

This closes netfilter bugzilla #851, reported by Alexander Neumann.

net/ipv6/netfilter/nf_nat_proto_icmpv6.c +2 -2
index 61aaf70..2205e8e 100644
@@ -69,8 +69,8 @@ icmpv6_manip_pkt(struct sk_buff *skb,
 	hdr = (struct icmp6hdr *)(skb->data + hdroff);
 	l3proto->csum_update(skb, iphdroff, &hdr->icmp6_cksum,
 			     tuple, maniptype);
-	if (hdr->icmp6_code == ICMPV6_ECHO_REQUEST ||
-	    hdr->icmp6_code == ICMPV6_ECHO_REPLY) {
+	if (hdr->icmp6_type == ICMPV6_ECHO_REQUEST ||
+	    hdr->icmp6_type == ICMPV6_ECHO_REPLY) {
 		inet_proto_csum_replace2(&hdr->icmp6_cksum, skb,
 					 hdr->icmp6_identifier,
 					 tuple->src.u.icmp.id, 0);
maintainer Applied
#1 lore raw
Quoted 6 lines · Phil Oester

In commit 58a317f1 (netfilter: ipv6: add IPv6 NAT support), icmpv6_manip_pkt was added with an incorrect comparison of ICMP codes to types. This causes problems when using NAT rules with the --random option. Correct the comparison.

This closes netfilter bugzilla #851, reported by Alexander Neumann.

Applied, thanks Phil.