Don't assume linear buffers in error handlers for VXLAN and GENEVE
Subsystems (2)
cover Don't assume linear buffers in error handlers for VXLAN and GENEVE
Guillaume noticed the same issue fixed by commit 26fc181e6cac ("fou, fou6:
do not assume linear skbs") for fou and fou6 is also present in VXLAN and GENEVE error handlers: we can't assume linear buffers there, we need to use pskb_may_pull() instead.
Stefano Brivio (2):
vxlan: Don't assume linear buffers in error handler
geneve: Don't assume linear buffers in error handler
drivers/net/geneve.c | 2 +- drivers/net/vxlan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 vxlan: Don't assume linear buffers in error handler
In commit c3a43b9fec8a ("vxlan: 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 VXLAN header with udp_hdr(), so we also need to sum skb_transport_header() here.
--- drivers/net/vxlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/vxlan.c +1 -1
@@ -1766,7 +1766,7 @@ static int vxlan_err_lookup(struct sock *sk, struct sk_buff *skb)struct vxlanhdr *hdr;__be32 vni; -if (skb->len <VXLAN_HLEN ) +if (!pskb_may_pull (skb,skb_transport_offset (skb) +VXLAN_HLEN ))return -EINVAL ; hdr =vxlan_hdr (skb);
Signature · 1 line
2.20.1
PATCH 2/2 geneve: Don't assume linear buffers in error handler
In reply to Stefano BrivioIn 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.
--- drivers/net/geneve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/geneve.c +1 -1
@@ -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);
Signature · 1 line
2.20.1
Quoted 5 lines · Stefano Brivio
Guillaume noticed the same issue fixed by commit
26fc181e6cac("fou, fou6:
do not assume linear skbs") for fou and fou6 is also present in VXLAN and GENEVE error handlers: we can't assume linear buffers there, we need to usepskb_may_pull()instead.
David Miller
maintainerFrom: Stefano Brivio <[email protected]>
Date: Tue, 11 Jun 2019 00:27:04 +0200
Quoted 4 lines
Guillaume noticed the same issue fixed by commit
26fc181e6cac("fou, fou6:
do not assume linear skbs") for fou and fou6 is also present in VXLAN and GENEVE error handlers: we can't assume linear buffers there, we need to usepskb_may_pull()instead.
Series applied and queued up for -stable, thanks for fixing this.