mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-09 01:59:41 +00:00
udp: with udp_segment release on error path
[ Upstream commit0f149c9fec
] Failure __ip_append_data triggers udp_flush_pending_frames, but these tests happen later. The skb must be freed directly. Fixes:bec1f6f697
("udp: generate gso with UDP_SEGMENT") Reported-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
84bf74307c
commit
e3fa624ee7
2 changed files with 24 additions and 8 deletions
|
@ -785,15 +785,23 @@ 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 + cork->gso_size > cork->fragsize) {
|
||||
kfree_skb(skb);
|
||||
return -EINVAL;
|
||||
if (skb->len > cork->gso_size * UDP_MAX_SEGMENTS)
|
||||
}
|
||||
if (skb->len > cork->gso_size * UDP_MAX_SEGMENTS) {
|
||||
kfree_skb(skb);
|
||||
return -EINVAL;
|
||||
if (sk->sk_no_check_tx)
|
||||
}
|
||||
if (sk->sk_no_check_tx) {
|
||||
kfree_skb(skb);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (skb->ip_summed != CHECKSUM_PARTIAL || is_udplite ||
|
||||
dst_xfrm(skb_dst(skb)))
|
||||
dst_xfrm(skb_dst(skb))) {
|
||||
kfree_skb(skb);
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
skb_shinfo(skb)->gso_size = cork->gso_size;
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_UDP_L4;
|
||||
|
|
|
@ -1056,15 +1056,23 @@ static int udp_v6_send_skb(struct sk_buff *skb, struct flowi6 *fl6,
|
|||
const int hlen = skb_network_header_len(skb) +
|
||||
sizeof(struct udphdr);
|
||||
|
||||
if (hlen + cork->gso_size > cork->fragsize)
|
||||
if (hlen + cork->gso_size > cork->fragsize) {
|
||||
kfree_skb(skb);
|
||||
return -EINVAL;
|
||||
if (skb->len > cork->gso_size * UDP_MAX_SEGMENTS)
|
||||
}
|
||||
if (skb->len > cork->gso_size * UDP_MAX_SEGMENTS) {
|
||||
kfree_skb(skb);
|
||||
return -EINVAL;
|
||||
if (udp_sk(sk)->no_check6_tx)
|
||||
}
|
||||
if (udp_sk(sk)->no_check6_tx) {
|
||||
kfree_skb(skb);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (skb->ip_summed != CHECKSUM_PARTIAL || is_udplite ||
|
||||
dst_xfrm(skb_dst(skb)))
|
||||
dst_xfrm(skb_dst(skb))) {
|
||||
kfree_skb(skb);
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
skb_shinfo(skb)->gso_size = cork->gso_size;
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_UDP_L4;
|
||||
|
|
Loading…
Reference in a new issue