* [PATCH] ipv4: dst_entry leak in ip_send_unicast_reply()
@ 2014-10-15 12:24 Vasily Averin
2014-10-17 15:59 ` David Miller
2014-10-17 19:30 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Vasily Averin @ 2014-10-15 12:24 UTC (permalink / raw)
To: Eric Dumazet, netdev, David S. Miller
Cc: Alexey Kuznetsov, James Morris, Hideaki YOSHIFUJI, Patrick McHardy
Fixes: 2e77d89b2fa8 ("net: avoid a pair of dst_hold()/dst_release() in ip_append_data()")
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
Signed-off-by: Vasily Averin <vvs@parallels.com>
---
net/ipv4/ip_output.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index e35b712..88e5ef2 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1535,6 +1535,7 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb,
struct sk_buff *nskb;
struct sock *sk;
struct inet_sock *inet;
+ int err;
if (__ip_options_echo(&replyopts.opt.opt, skb, sopt))
return;
@@ -1574,8 +1575,13 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb,
sock_net_set(sk, net);
__skb_queue_head_init(&sk->sk_write_queue);
sk->sk_sndbuf = sysctl_wmem_default;
- ip_append_data(sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base, len, 0,
- &ipc, &rt, MSG_DONTWAIT);
+ err = ip_append_data(sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base,
+ len, 0, &ipc, &rt, MSG_DONTWAIT);
+ if (unlikely(err)) {
+ ip_flush_pending_frames(sk);
+ goto out;
+ }
+
nskb = skb_peek(&sk->sk_write_queue);
if (nskb) {
if (arg->csumoffset >= 0)
@@ -1587,7 +1593,7 @@ void ip_send_unicast_reply(struct net *net, struct sk_buff *skb,
skb_set_queue_mapping(nskb, skb_get_queue_mapping(skb));
ip_push_pending_frames(sk, &fl4);
}
-
+out:
put_cpu_var(unicast_sock);
ip_rt_put(rt);
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ipv4: dst_entry leak in ip_send_unicast_reply()
2014-10-15 12:24 [PATCH] ipv4: dst_entry leak in ip_send_unicast_reply() Vasily Averin
@ 2014-10-17 15:59 ` David Miller
2014-10-17 16:56 ` Eric Dumazet
2014-10-17 19:30 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: David Miller @ 2014-10-17 15:59 UTC (permalink / raw)
To: vvs; +Cc: eric.dumazet, netdev, kuznet, jmorris, yoshfuji, kaber
From: Vasily Averin <vvs@parallels.com>
Date: Wed, 15 Oct 2014 16:24:02 +0400
> Fixes: 2e77d89b2fa8 ("net: avoid a pair of dst_hold()/dst_release() in ip_append_data()")
>
> 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
>
> Signed-off-by: Vasily Averin <vvs@parallels.com>
Please, in the future, put the Fixes: tag first in the list of signoffs.
Eric, please review this change, it looks good to me.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ipv4: dst_entry leak in ip_send_unicast_reply()
2014-10-17 15:59 ` David Miller
@ 2014-10-17 16:56 ` Eric Dumazet
0 siblings, 0 replies; 4+ messages in thread
From: Eric Dumazet @ 2014-10-17 16:56 UTC (permalink / raw)
To: David Miller; +Cc: vvs, netdev, kuznet, jmorris, yoshfuji, kaber
On Fri, 2014-10-17 at 11:59 -0400, David Miller wrote:
> From: Vasily Averin <vvs@parallels.com>
> Date: Wed, 15 Oct 2014 16:24:02 +0400
>
> > Fixes: 2e77d89b2fa8 ("net: avoid a pair of dst_hold()/dst_release() in ip_append_data()")
> >
> > 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
> >
> > Signed-off-by: Vasily Averin <vvs@parallels.com>
>
> Please, in the future, put the Fixes: tag first in the list of signoffs.
>
> Eric, please review this change, it looks good to me.
It is good indeed, thanks !
Acked-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ipv4: dst_entry leak in ip_send_unicast_reply()
2014-10-15 12:24 [PATCH] ipv4: dst_entry leak in ip_send_unicast_reply() Vasily Averin
2014-10-17 15:59 ` David Miller
@ 2014-10-17 19:30 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2014-10-17 19:30 UTC (permalink / raw)
To: vvs; +Cc: eric.dumazet, netdev, kuznet, jmorris, yoshfuji, kaber
From: Vasily Averin <vvs@parallels.com>
Date: Wed, 15 Oct 2014 16:24:02 +0400
> Fixes: 2e77d89b2fa8 ("net: avoid a pair of dst_hold()/dst_release() in ip_append_data()")
>
> 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
>
> Signed-off-by: Vasily Averin <vvs@parallels.com>
Applied and queued up for -stable, thanks everyone!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-10-17 19:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-15 12:24 [PATCH] ipv4: dst_entry leak in ip_send_unicast_reply() Vasily Averin
2014-10-17 15:59 ` David Miller
2014-10-17 16:56 ` Eric Dumazet
2014-10-17 19:30 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).