ip_gre: set dev->hard_header_len and dev->needed_headroom properly
Subsystems (3)
PATCH v3 1/1 ip_gre: set dev->hard_header_len and dev->needed_headroom properly
GRE tunnel has its own header_ops, ipgre_header_ops, and sets it conditionally. When it is set, it assumes the outer IP header is already created before ipgre_xmit().
This is not true when we send packets through a raw packet socket, where L2 headers are supposed to be constructed by user. Packet socket calls dev_validate_header() to validate the header. But GRE tunnel does not set dev->hard_header_len, so that check can be simply bypassed, therefore uninit memory could be passed down to ipgre_xmit(). Similar for dev->needed_headroom.
dev->hard_header_len is supposed to be the length of the header created by dev->header_ops->create(), so it should be used whenever header_ops is set, and dev->needed_headroom should be used when it is not set.
---
Note, there are some other suspicious use of dev->hard_header_len in the same file, but let's leave them to a separate patch if really needed.
v2: pass 0 to skb_cow_head()
v1: fix dev->needed_headroom and update ipgre_link_update()
net/ipv4/ip_gre.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
net/ipv4/ip_gre.c +11 -4
@@ -625,9 +625,7 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, }if (dev->header_ops) { -/* Need space for new headers */ -if (skb_cow_head (skb, dev->needed_headroom - - (tunnel->hlen +sizeof (struct iphdr )))) +if (skb_cow_head (skb,0 )) goto free_skb; tnl_params = (const struct iphdr *)skb->data;
@@ -748,7 +746,11 @@ static void ipgre_link_update(struct net_device *dev, bool set_mtu) len = tunnel->tun_hlen - len; tunnel->hlen = tunnel->hlen + len; - dev->needed_headroom = dev->needed_headroom + len; +if (dev->header_ops) + dev->hard_header_len += len; +else + dev->needed_headroom += len; +if (set_mtu) dev->mtu =max_t (int, dev->mtu - len,68 );
@@ -944,6 +946,7 @@ static void __gre_tunnel_init(struct net_device *dev) tunnel->parms.iph.protocol =IPPROTO_GRE ; tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen; + dev->needed_headroom = tunnel->hlen +sizeof (tunnel->parms.iph); dev->features |=GRE_FEATURES ; dev->hw_features |=GRE_FEATURES ;
@@ -987,10 +990,14 @@ static int ipgre_tunnel_init(struct net_device *dev)return -EINVAL ; dev->flags =IFF_BROADCAST ; dev->header_ops = &ipgre_header_ops; + dev->hard_header_len = tunnel->hlen +sizeof (*iph); + dev->needed_headroom = 0; }#endif }else if (!tunnel->collect_md) { dev->header_ops = &ipgre_header_ops; + dev->hard_header_len = tunnel->hlen +sizeof (*iph); + dev->needed_headroom =0 ; }return ip_tunnel_init (dev);
Signature · 1 line
2.28.0
Quoted 4 lines · Cong Wang
Note, there are some other suspicious use of
dev->hard_header_lenin the same file, but let's leave them to a separate patch if really needed.
I looked at the file (before this patch). There are 4 occurrences of hard_header_len, but they are all for ERSPAN devices (TAP devices which tunnel Ethernet frames). So I think they are used for the Ethernet header length and we don't need to worry about them.
Quoted 12 lines · Cong Wang
GRE tunnel has its own
header_ops,ipgre_header_ops, and sets it conditionally. When it is set, it assumes the outer IP header is already created beforeipgre_xmit().This is not true when we send packets through a raw packet socket, where L2 headers are supposed to be constructed by user. Packet socket calls
dev_validate_header()to validate the header. But GRE tunnel does not setdev->hard_header_len, so that check can be simply bypassed, therefore uninit memory could be passed down toipgre_xmit(). Similar fordev->needed_headroom.
Quoted 4 lines
dev->hard_header_lenis supposed to be the length of the header created bydev->header_ops->create(), so it should be used wheneverheader_opsis set, anddev->needed_headroomshould be used when it is not set.
Thank you for your work, Cong!
Quoted 16 lines · On Mon, 12 Oct 2020 16:17:21 -0700 Cong Wang wrote:
GRE tunnel has its own
header_ops,ipgre_header_ops, and sets it conditionally. When it is set, it assumes the outer IP header is already created beforeipgre_xmit().This is not true when we send packets through a raw packet socket, where L2 headers are supposed to be constructed by user. Packet socket calls
dev_validate_header()to validate the header. But GRE tunnel does not setdev->hard_header_len, so that check can be simply bypassed, therefore uninit memory could be passed down toipgre_xmit(). Similar fordev->needed_headroom.
dev->hard_header_lenis supposed to be the length of the header created bydev->header_ops->create(), so it should be used wheneverheader_opsis set, anddev->needed_headroomshould be used when it is not set.
Quoted 5 lines
Reported-and-tested-by [email protected]Cc Xie He <[email protected]>Cc William Tu <[email protected]>Acked-by Willem de Bruijn <[email protected]>Signed-off-by Cong Wang <[email protected]>
Applied, thank you!