diff options
| author | Stefano Brivio <sbrivio@redhat.com> | 2019-06-11 00:27:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-11 12:07:33 -0700 |
| commit | eccc73a6b2cb6c04bfbc40a0769f3c428dfba232 (patch) | |
| tree | 994badb500db658d9b407df09903fe180bae25a2 /drivers/net/geneve.c | |
| parent | 8399a6930d12f5965230f4ff058228a4cc80c0b9 (diff) | |
| download | lwn-eccc73a6b2cb6c04bfbc40a0769f3c428dfba232.tar.gz lwn-eccc73a6b2cb6c04bfbc40a0769f3c428dfba232.zip | |
geneve: Don't assume linear buffers in error handler
In commit a07966447f39 ("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 commits 26fc181e6cac
("fou, fou6: do not assume linear skbs") and 5355ed6388e2 ("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: a07966447f39 ("geneve: ICMP error lookup handler")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/geneve.c')
| -rw-r--r-- | drivers/net/geneve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 98d1a45c0606..25770122c219 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -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); |