Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac6a3722 authored by Simon Horman's avatar Simon Horman Committed by David S. Miller
Browse files

flow dissector: correct size of storage for ARP 



The last argument to __skb_header_pointer() should be a buffer large
enough to store struct arphdr. This can be a pointer to a struct arphdr
structure. The code was previously using a pointer to a pointer to
struct arphdr.

By my counting the storage available both before and after is 8 bytes on
x86_64.

Fixes: 55733350 ("flow disector: ARP support")
Reported-by: default avatarNicolas Iooss <nicolas.iooss_linux@m4x.org>
Signed-off-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75514b66

net/core/flow_dissector.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
			unsigned char ar_tip[4];

		} *arp_eth, _arp_eth;

		const struct arphdr *arp;

		struct arphdr *_arp;

		struct arphdr _arp;



		arp = __skb_header_pointer(skb, nhoff, sizeof(_arp), data,

					   hlen, &_arp);