aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-09-16 12:27:50 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-16 21:46:15 -0700
commite71895a1beff2014534c9660d9ae42e043f11555 (patch)
treebec0ddc23b1176cac8f3a53b76aa8f2bc5e653a1
parent801e147cde02f04b5c2f42764cd43a89fc7400a2 (diff)
downloadmrst-s0i3-test-e71895a1beff2014534c9660d9ae42e043f11555.tar.gz
mrst-s0i3-test-e71895a1beff2014534c9660d9ae42e043f11555.tar.xz
mrst-s0i3-test-e71895a1beff2014534c9660d9ae42e043f11555.zip
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>
-rw-r--r--net/xfrm/xfrm_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index a3cca0a9434..64f2ae1fdc1 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));