diff options
| author | Willem de Bruijn | 2019-01-15 17:40:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-01-31 08:14:33 +0100 |
| commit | e3fa624ee7aff48d6933d31b50c93b77e54ef583 (patch) | |
| tree | c4d4142c3136e0610af71f3215bc17b67eec248f /net/ipv4 | |
| parent | net/sched: cls_flower: allocate mask dynamically in fl_change() (diff) | |
| download | kernel-qcow2-linux-e3fa624ee7aff48d6933d31b50c93b77e54ef583.tar.gz kernel-qcow2-linux-e3fa624ee7aff48d6933d31b50c93b77e54ef583.tar.xz kernel-qcow2-linux-e3fa624ee7aff48d6933d31b50c93b77e54ef583.zip | |
udp: with udp_segment release on error path
[ Upstream commit 0f149c9fec3cd720628ecde83bfc6f64c1e7dcb6 ]
Failure __ip_append_data triggers udp_flush_pending_frames, but these
tests happen later. The skb must be freed directly.
Fixes: bec1f6f697362 ("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>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/udp.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index f8183fdce5b2..e45a5e19e509 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -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; |