diff options
| author | Mark Brown <broonie@kernel.org> | 2024-10-07 14:01:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-10-07 14:01:00 +0100 |
| commit | 85eadae61931f6268b49b5722039e5a248b9ee4c (patch) | |
| tree | 3ee81f25a394ce2a2ec706f0aff07515b78d4b01 /include/linux/virtio_net.h | |
| parent | dc16594d9967773ca891b3d9111f152e3c99d1cf (diff) | |
| parent | 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff) | |
regulator: Merge up v6.12-rc2
Pulls in a build fix for the KVM selftests.
Diffstat (limited to 'include/linux/virtio_net.h')
| -rw-r--r-- | include/linux/virtio_net.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h index 276ca543ef44..02a9f4dc594d 100644 --- a/include/linux/virtio_net.h +++ b/include/linux/virtio_net.h @@ -103,8 +103,10 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb, if (!skb_partial_csum_set(skb, start, off)) return -EINVAL; + if (skb_transport_offset(skb) < nh_min_len) + return -EINVAL; - nh_min_len = max_t(u32, nh_min_len, skb_transport_offset(skb)); + nh_min_len = skb_transport_offset(skb); p_off = nh_min_len + thlen; if (!pskb_may_pull(skb, p_off)) return -EINVAL; |