diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-02-06 15:18:14 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-02-06 15:19:00 -0800 |
| commit | ba6ec09911b805778a2fed6d626bfe77b011a717 (patch) | |
| tree | 051fa81966585531550c9cae3e638f87e9f281ea /net/ipv4 | |
| parent | 0bdcfaf84a9428c49f971be9024505b9e3b43038 (diff) | |
| parent | 3cf0a98fea776adb09087e521fe150c295a4b031 (diff) | |
| download | ath-ba6ec09911b805778a2fed6d626bfe77b011a717.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.14-rc2).
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/udp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index c472c9a57cf68..a9bb9ce5438ea 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1141,9 +1141,9 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4, const int hlen = skb_network_header_len(skb) + sizeof(struct udphdr); - if (hlen + cork->gso_size > cork->fragsize) { + if (hlen + min(datalen, cork->gso_size) > cork->fragsize) { kfree_skb(skb); - return -EINVAL; + return -EMSGSIZE; } if (datalen > cork->gso_size * UDP_MAX_SEGMENTS) { kfree_skb(skb); |