Commit 027ac58e authored Nov 14, 2015 by Ben Cartwright-Cox Committed by David S. Miller Nov 16, 2015

raw: increment correct SNMP counters for ICMP messages



Sending ICMP packets with raw sockets ends up in the SNMP counters
logging the type as the first byte of the IPv4 header rather than
the ICMP header. This is fixed by adding the IP Header Length to
the casting into a icmphdr struct.

Signed-off-by: Ben Cartwright-Cox <ben@benjojo.co.uk>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c300366b

net/ipv4/raw.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -406,10 +406,12 @@ static int raw_send_hdrinc(struct sock sk, struct flowi4 fl4,
		ip_select_ident(net, skb, NULL);

		iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
		}
		if (iph->protocol == IPPROTO_ICMP)
		skb->transport_header += iphlen;
		if (iph->protocol == IPPROTO_ICMP &&
		length >= iphlen + sizeof(struct icmphdr))
		icmp_out_count(net, ((struct icmphdr *)
		skb_transport_header(skb))->type);
		}

		err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT,
		net, sk, skb, NULL, rt->dst.dev,

Admin message