* [PATCH net v2] adding missing rcu_read_unlock in ipxip6_rcv
@ 2017-12-07 1:15 Nikita V. Shirokov
2017-12-07 1:54 ` Alexei Starovoitov
2017-12-07 19:00 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Nikita V. Shirokov @ 2017-12-07 1:15 UTC (permalink / raw)
To: netdev; +Cc: ast, vnuorval, Nikita V. Shirokov
commit 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels")
introduced new exit point in ipxip6_rcv. however rcu_read_unlock is
missing there. this diff is fixing this
v1->v2:
instead of doing rcu_read_unlock in place, we are going to "drop"
section (to prevent skb leakage)
Signed-off-by: Nikita V. Shirokov <tehnerd@fb.com>
---
net/ipv6/ip6_tunnel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 3d3092a..db84f52 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -904,7 +904,7 @@ static int ipxip6_rcv(struct sk_buff *skb, u8 ipproto,
if (t->parms.collect_md) {
tun_dst = ipv6_tun_rx_dst(skb, 0, 0, 0);
if (!tun_dst)
- return 0;
+ goto drop;
}
ret = __ip6_tnl_rcv(t, skb, tpi, tun_dst, dscp_ecn_decapsulate,
log_ecn_error);
--
2.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net v2] adding missing rcu_read_unlock in ipxip6_rcv
2017-12-07 1:15 [PATCH net v2] adding missing rcu_read_unlock in ipxip6_rcv Nikita V. Shirokov
@ 2017-12-07 1:54 ` Alexei Starovoitov
2017-12-07 19:00 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Alexei Starovoitov @ 2017-12-07 1:54 UTC (permalink / raw)
To: Nikita V. Shirokov
Cc: netdev, ast, vnuorval, Daniel Borkmann, David S. Miller
On Wed, Dec 06, 2017 at 05:15:43PM -0800, Nikita V. Shirokov wrote:
> commit 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels")
> introduced new exit point in ipxip6_rcv. however rcu_read_unlock is
> missing there. this diff is fixing this
>
> v1->v2:
> instead of doing rcu_read_unlock in place, we are going to "drop"
> section (to prevent skb leakage)
>
> Signed-off-by: Nikita V. Shirokov <tehnerd@fb.com>
thanks for fixing my mess.
Fixes: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels")
Acked-by: Alexei Starovoitov <ast@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net v2] adding missing rcu_read_unlock in ipxip6_rcv
2017-12-07 1:15 [PATCH net v2] adding missing rcu_read_unlock in ipxip6_rcv Nikita V. Shirokov
2017-12-07 1:54 ` Alexei Starovoitov
@ 2017-12-07 19:00 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-12-07 19:00 UTC (permalink / raw)
To: tehnerd; +Cc: netdev, ast, vnuorval
From: "Nikita V. Shirokov" <tehnerd@fb.com>
Date: Wed, 6 Dec 2017 17:15:43 -0800
> commit 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels")
> introduced new exit point in ipxip6_rcv. however rcu_read_unlock is
> missing there. this diff is fixing this
>
> v1->v2:
> instead of doing rcu_read_unlock in place, we are going to "drop"
> section (to prevent skb leakage)
>
> Signed-off-by: Nikita V. Shirokov <tehnerd@fb.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-07 19:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-07 1:15 [PATCH net v2] adding missing rcu_read_unlock in ipxip6_rcv Nikita V. Shirokov
2017-12-07 1:54 ` Alexei Starovoitov
2017-12-07 19:00 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox