Commit a591a8b6 authored by Vasily Averin's avatar Vasily Averin Committed by Luis Henriques

ipv4: dst_entry leak in ip_send_unicast_reply()

commit 4062090e upstream.

ip_setup_cork() called inside ip_append_data() steals dst entry from rt to cork
and in case errors in __ip_append_data() nobody frees stolen dst entry

Fixes: 2e77d89b ("net: avoid a pair of dst_hold()/dst_release() in ip_append_data()")
Signed-off-by: default avatarVasily Averin <vvs@parallels.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 0ec24ad1
...@@ -1528,6 +1528,7 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr, ...@@ -1528,6 +1528,7 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr,
struct sk_buff *nskb; struct sk_buff *nskb;
struct sock *sk; struct sock *sk;
struct inet_sock *inet; struct inet_sock *inet;
int err;
if (ip_options_echo(&replyopts.opt.opt, skb)) if (ip_options_echo(&replyopts.opt.opt, skb))
return; return;
...@@ -1567,8 +1568,13 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr, ...@@ -1567,8 +1568,13 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr,
sock_net_set(sk, net); sock_net_set(sk, net);
__skb_queue_head_init(&sk->sk_write_queue); __skb_queue_head_init(&sk->sk_write_queue);
sk->sk_sndbuf = sysctl_wmem_default; sk->sk_sndbuf = sysctl_wmem_default;
ip_append_data(sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base, len, 0, err = ip_append_data(sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base,
&ipc, &rt, MSG_DONTWAIT); len, 0, &ipc, &rt, MSG_DONTWAIT);
if (unlikely(err)) {
ip_flush_pending_frames(sk);
goto out;
}
nskb = skb_peek(&sk->sk_write_queue); nskb = skb_peek(&sk->sk_write_queue);
if (nskb) { if (nskb) {
if (arg->csumoffset >= 0) if (arg->csumoffset >= 0)
...@@ -1580,7 +1586,7 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr, ...@@ -1580,7 +1586,7 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr,
skb_set_queue_mapping(nskb, skb_get_queue_mapping(skb)); skb_set_queue_mapping(nskb, skb_get_queue_mapping(skb));
ip_push_pending_frames(sk, &fl4); ip_push_pending_frames(sk, &fl4);
} }
out:
put_cpu_var(unicast_sock); put_cpu_var(unicast_sock);
ip_rt_put(rt); ip_rt_put(rt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment