geneve: Don't assume linear buffers in error handler
In commita07966447f
("geneve: ICMP error lookup handler") I wrongly assumed buffers from icmp_socket_deliver() would be linear. This is not the case: icmp_socket_deliver() only guarantees we have 8 bytes of linear data. Eric fixed this same issue for fou and fou6 in commits26fc181e6c
("fou, fou6: do not assume linear skbs") and5355ed6388
("fou, fou6: avoid uninit-value in gue_err() and gue6_err()"). Use pskb_may_pull() instead of checking skb->len, and take into account the fact we later access the GENEVE header with udp_hdr(), so we also need to sum skb_transport_header() here. Reported-by: Guillaume Nault <gnault@redhat.com> Fixes:a07966447f
("geneve: ICMP error lookup handler") Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
8399a6930d
commit
eccc73a6b2
|
@ -395,7 +395,7 @@ static int geneve_udp_encap_err_lookup(struct sock *sk, struct sk_buff *skb)
|
|||
u8 zero_vni[3] = { 0 };
|
||||
u8 *vni = zero_vni;
|
||||
|
||||
if (skb->len < GENEVE_BASE_HLEN)
|
||||
if (!pskb_may_pull(skb, skb_transport_offset(skb) + GENEVE_BASE_HLEN))
|
||||
return -EINVAL;
|
||||
|
||||
geneveh = geneve_hdr(skb);
|
||||
|
|
Loading…
Reference in a new issue