From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 16 Sep 2010 12:27:50 +0000 (+0000)
Subject: xfrm: dont assume rcu_read_lock in xfrm_output_one()
X-Git-Tag: v2.6.36-rc5~12^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e71895a1beff2014534c9660d9ae42e043f11555;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

xfrm: dont assume rcu_read_lock in xfrm_output_one()

ip_local_out() is called with rcu_read_lock() held from ip_queue_xmit()
but not from other call sites.

Reported-and-bisected-by: Nick Bowler <nbowler@elliptictech.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index a3cca0a..64f2ae1 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -101,7 +101,7 @@ resume:
 			err = -EHOSTUNREACH;
 			goto error_nolock;
 		}
-		skb_dst_set_noref(skb, dst);
+		skb_dst_set(skb, dst_clone(dst));
 		x = dst->xfrm;
 	} while (x && !(x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL));