Skip to contentSkip to conversation

ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()

PATCH In review Ben Hutchings 3 participants 3 messages May 31, 2017 – Jun 2, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()

xfrm6_find_1stfragopt() may now return an error code and we must not treat it as a length.

Fixes 2423496af35d ("ipv6: Prevent overrun when parsing v6 header options")

---
Commits 2423496af35d "ipv6: Prevent overrun when parsing v6 header options" and 7dd7eb9513bd "ipv6: Check ip6_find_1stfragopt() return value properly." changed ip6_find_1stfragopt() to return negative error codes and changed some of its callers to handle this.

However, there is also xfrm6_find_1stfragopt() which is a wrapper for ip6_find_1stfragopt() and is called indirectly by xfrm6_ro_output() and xfrm6_transport_output(). Neither of them check for errors.

This is totally untested. I think xfrm_type::hdr_offset deserves a comment about its semantics, but I don't understand it well enogugh to write that.

Ben.

 net/ipv6/xfrm6_mode_ro.c        | 2 ++
 net/ipv6/xfrm6_mode_transport.c | 2 ++
 2 files changed, 4 insertions(+)
net/ipv6/xfrm6_mode_ro.c +2 -0
index 0e015906f9ca..07d36573f50b 100644
@@ -47,6 +47,8 @@ static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb)
 	iph = ipv6_hdr(skb);
 
 	hdr_len = x->type->hdr_offset(x, skb, &prevhdr);
+	if (hdr_len < 0)
+		return hdr_len;
 	skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data);
 	skb_set_network_header(skb, -x->props.header_len);
 	skb->transport_header = skb->network_header + hdr_len;
net/ipv6/xfrm6_mode_transport.c +2 -0
index 7a92c0f31912..9ad07a91708e 100644
@@ -30,6 +30,8 @@ static int xfrm6_transport_output(struct xfrm_state *x, struct sk_buff *skb)
 	skb_set_inner_transport_header(skb, skb_transport_offset(skb));
 
 	hdr_len = x->type->hdr_offset(x, skb, &prevhdr);
+	if (hdr_len < 0)
+		return hdr_len;
 	skb_set_mac_header(skb, (prevhdr - x->props.header_len) - skb->data);
 	skb_set_network_header(skb, -x->props.header_len);
 	skb->transport_header = skb->network_header + hdr_len;
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Ben Hutchings

xfrm6_find_1stfragopt() may now return an error code and we must not treat it as a length.

Fixes 2423496af35d ("ipv6: Prevent overrun when parsing v6 header options")

---
Commits 2423496af35d "ipv6: Prevent overrun when parsing v6 header options" and 7dd7eb9513bd "ipv6: Check ip6_find_1stfragopt() return value properly." changed ip6_find_1stfragopt() to return negative error codes and changed some of its callers to handle this.

Quoted 7 lines

However, there is also xfrm6_find_1stfragopt() which is a wrapper for ip6_find_1stfragopt() and is called indirectly by xfrm6_ro_output() and xfrm6_transport_output(). Neither of them check for errors.

This is totally untested. I think xfrm_type::hdr_offset deserves a comment about its semantics, but I don't understand it well enogugh to write that.

Thank you for finding this, it's a good lesson to not rely solely on cscope :\

I believe this fix is correct and sufficient. I only found 2 up-stack callers of this (pktgen_output_ipsec and xfrm_output_one) and they both ultimately call kfree_skb on error.

However, the fact that this function is used as a function pointer through xfrm_type.hdr_offset made me look at a couple other functions that can be stored in this structure. mip6_destopt_offset and mip6_rthdr_offset have very similar implementations to the original ip6_find_1stfragopt and may very well suffer from the same bug I was trying to fix. Maybe it doesn't matter since that bug relied on the user changing the v6 nexthdr field. I need to understand the mip6 code first...

In any event, I think this patch applies on its own. Thanks again.