diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index b8b06e71b73ea3fb5210239f585f4ba714395fd7..14b923ddb6dfcc3c031a7c9e4cb5fc4171424616 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3033,6 +3033,29 @@ static inline void skb_reset_transport_header(struct sk_buff *skb)
        skb->transport_header = offset;
 }
 
+/**
+ * skb_reset_transport_header_careful - conditionally reset transport header
+ * @skb: buffer to alter
+ *
+ * Hardened version of skb_reset_transport_header().
+ *
+ * Returns: true if the operation was a success.
+ */
+static inline bool __must_check
+skb_reset_transport_header_careful(struct sk_buff *skb)
+{
+       long offset = skb->data - skb->head;
+
+       if (unlikely(offset != (typeof(skb->transport_header))offset))
+               return false;
+
+       if (unlikely(offset == (typeof(skb->transport_header))~0U))
+               return false;
+
+       skb->transport_header = offset;
+       return true;
+}
+
 static inline void skb_set_transport_header(struct sk_buff *skb,
                                            const int offset)
 {
diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c
index 9822163428b028d6dbf3f48abe4674bd6c581725..fce91183797a60fcbf271c73e086aeb0aa9d40c6 100644
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
@@ -148,7 +148,9 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,
 
        ops = rcu_dereference(inet6_offloads[proto]);
        if (likely(ops && ops->callbacks.gso_segment)) {
-               skb_reset_transport_header(skb);
+               if (!skb_reset_transport_header_careful(skb))
+                       goto out;
+
                segs = ops->callbacks.gso_segment(skb, features);
                if (!segs)
                        skb->network_header = skb_mac_header(skb) + nhoff - skb->head;