ip_gre: test csum_start instead of transport header
Subsystems (3)
PATCH 1/1 ip_gre: test csum_start instead of transport header
From: Willem de Bruijn <[email protected]>
GRE with TUNNEL_CSUM will apply local checksum offload on CHECKSUM_PARTIAL packets.
ipgre_xmit must validate csum_start after an optional skb_pull, else lco_csum may trigger an overflow. The original check was
if (csum && skb_checksum_start(skb) < skb->data) return -EINVAL;
This had false positives when skb_checksum_start is undefined:
when ip_summed is not CHECKSUM_PARTIAL. A discussed refinement was straightforward
if (csum && skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_start(skb) < skb->data) return -EINVAL;
But was eventually revised more thoroughly:
- restrict the check to the only branch where needed, in an uncommon GRE path that uses header_ops and calls skb_pull.
- test skb_transport_header, which is set along with csum_start in skb_partial_csum_set in the normal header_ops datapath.
Turns out skbs can arrive in this branch without the transport header set, e.g., through BPF redirection.
Revise the check back to check csum_start directly, and only if CHECKSUM_PARTIAL. Do leave the check in the updated location. Check field regardless of whether TUNNEL_CSUM is configured.
--- net/ipv4/ip_gre.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
net/ipv4/ip_gre.c +5 -6
@@ -629,21 +629,20 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, }if (dev->header_ops) { -const int pull_len = tunnel->hlen +sizeof (struct iphdr ); -if (skb_cow_head (skb,0 )) goto free_skb; tnl_params = (const struct iphdr *)skb->data; -if (pull_len >skb_transport_offset (skb)) - goto free_skb; -/* Pull skb since ip_tunnel_xmit() needs skb->data pointing * to gre header. */ -skb_pull (skb, pull_len); +skb_pull (skb, tunnel->hlen +sizeof (struct iphdr ));skb_reset_mac_header (skb); + +if (skb->ip_summed ==CHECKSUM_PARTIAL && +skb_checksum_start (skb) < skb->data) + goto free_skb; }else {if (skb_cow_head (skb, dev->needed_headroom)) goto free_skb;
Signature · 1 line
2.36.1.255.ge46751e96f-goog
Quoted 33 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
GRE with
TUNNEL_CSUMwill apply local checksum offload onCHECKSUM_PARTIALpackets.
ipgre_xmitmust validatecsum_startafter an optionalskb_pull, elselco_csummay trigger an overflow. The original check wasif (csum && skb_checksum_start(skb) < skb->data) return -EINVAL;This had false positives when
skb_checksum_startis undefined:
whenip_summedis notCHECKSUM_PARTIAL. A discussed refinement was straightforwardif (csum && skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_start(skb) < skb->data) return -EINVAL;But was eventually revised more thoroughly:
- restrict the check to the only branch where needed, in an uncommon GRE path that usesheader_opsand callsskb_pull.
- testskb_transport_header, which is set along withcsum_startinskb_partial_csum_setin the normalheader_opsdatapath.Turns out skbs can arrive in this branch without the transport header set, e.g., through BPF redirection.
Revise the check back to check
csum_startdirectly, and only ifCHECKSUM_PARTIAL. Do leave the check in the updated location. Check field regardless of whetherTUNNEL_CSUMis configured.
Quoted 5 lines
Fixes 8a0ed250f911 ("ip_gre: validate csum_start only on pull")Reported-by syzbot <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>
Jakub Kicinski
maintainerQuoted 32 lines · On Mon, 6 Jun 2022 09:21:07 -0400 Willem de Bruijn wrote:
From: Willem de Bruijn <[email protected]>
GRE with
TUNNEL_CSUMwill apply local checksum offload onCHECKSUM_PARTIALpackets.
ipgre_xmitmust validatecsum_startafter an optionalskb_pull, elselco_csummay trigger an overflow. The original check wasif (csum && skb_checksum_start(skb) < skb->data) return -EINVAL;This had false positives when
skb_checksum_startis undefined:
whenip_summedis notCHECKSUM_PARTIAL. A discussed refinement was straightforwardif (csum && skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_start(skb) < skb->data) return -EINVAL;But was eventually revised more thoroughly:
- restrict the check to the only branch where needed, in an uncommon GRE path that usesheader_opsand callsskb_pull.
- testskb_transport_header, which is set along withcsum_startinskb_partial_csum_setin the normalheader_opsdatapath.Turns out skbs can arrive in this branch without the transport header set, e.g., through BPF redirection.
Revise the check back to check
csum_startdirectly, and only ifCHECKSUM_PARTIAL. Do leave the check in the updated location. Check field regardless of whetherTUNNEL_CSUMis configured.
Quoted 5 lines
Fixes 8a0ed250f911 ("ip_gre: validate csum_start only on pull")Reported-by syzbot <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>
Missing a CC for Alex, adding now.
Quoted 62 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
GRE with
TUNNEL_CSUMwill apply local checksum offload onCHECKSUM_PARTIALpackets.
ipgre_xmitmust validatecsum_startafter an optionalskb_pull, elselco_csummay trigger an overflow. The original check wasif (csum && skb_checksum_start(skb) < skb->data) return -EINVAL;This had false positives when
skb_checksum_startis undefined:
whenip_summedis notCHECKSUM_PARTIAL. A discussed refinement was straightforwardif (csum && skb->ip_summed == CHECKSUM_PARTIAL && skb_checksum_start(skb) < skb->data) return -EINVAL;But was eventually revised more thoroughly:
- restrict the check to the only branch where needed, in an uncommon GRE path that usesheader_opsand callsskb_pull.
- testskb_transport_header, which is set along withcsum_startinskb_partial_csum_setin the normalheader_opsdatapath.Turns out skbs can arrive in this branch without the transport header set, e.g., through BPF redirection.
Revise the check back to check
csum_startdirectly, and only ifCHECKSUM_PARTIAL. Do leave the check in the updated location. Check field regardless of whetherTUNNEL_CSUMis configured.Fixes 8a0ed250f911 ("ip_gre: validate csum_start only on pull")Reported-by syzbot <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>--- net/ipv4/ip_gre.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)net/ipv4/ip_gre.c +0
-5@@ -629,21 +629,20 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, }if (dev->header_ops) { -const int pull_len = tunnel->hlen +sizeof (struct iphdr ); -if (skb_cow_head (skb,0 )) goto free_skb; tnl_params = (const struct iphdr *)skb->data; -if (pull_len >skb_transport_offset (skb)) - goto free_skb; -/* Pull skb since ip_tunnel_xmit() needs skb->data pointing * to gre header. */
net/ipv4/ip_gre.c static netdev_tx_t ipgre_xmit(struct sk_buff *skb, · line 648
Quoted 10 lines
net/ipv4/ip_gre.c +5
-1-skb_pull (skb, pull_len); +skb_pull (skb, tunnel->hlen +sizeof (struct iphdr ));skb_reset_mac_header (skb); + +if (skb->ip_summed ==CHECKSUM_PARTIAL && +skb_checksum_start (skb) < skb->data) + goto free_skb; }else {if (skb_cow_head (skb, dev->needed_headroom)) goto free_skb;
The one thing I might change would be the ordering of your two tests at the end. It is more likely that skb_checksum_start will be less than skb->data in most cases as skb->csum_start is initialized to 0 at allocation. So cases where it is greater than skb->data should be rare whereas the CHECKSUM_PARTIAL check will come up as true probably more often then not as it isn't uncommon to see checksum or TSO offloaded frames.
Anyway functionality-wise this looks good to me and what I suggested is more of an optimization anyway.
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Mon, 6 Jun 2022 09:21:07 -0400 you wrote:
From: Willem de Bruijn <[email protected]>
GRE with
TUNNEL_CSUMwill apply local checksum offload onCHECKSUM_PARTIALpackets.
ipgre_xmitmust validatecsum_startafter an optionalskb_pull, elselco_csummay trigger an overflow. The original check was[...]
Here is the summary with links:
- [net] ip_gre: test csum_start instead of transport header
https://git.kernel.org/netdev/net/c/8d21e9963bec
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html