Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 875168a9 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: tunnels should use rcu_dereference 



tunnel4_handlers, tunnel64_handlers, tunnel6_handlers and
tunnel46_handlers are protected by RCU, but we dont use appropriate rcu
primitives to scan them. rcu_lock() is already held by caller.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06427013

net/ipv4/tunnel4.c

+9 −4
Original line number Diff line number Diff line
@@ -73,6 +73,11 @@ int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family) 
}

EXPORT_SYMBOL(xfrm4_tunnel_deregister);



#define for_each_tunnel_rcu(head, handler)		\

	for (handler = rcu_dereference(head);		\

	     handler != NULL;				\

	     handler = rcu_dereference(handler->next))	\

	

static int tunnel4_rcv(struct sk_buff *skb)

{

	struct xfrm_tunnel *handler;
@@ -80,7 +85,7 @@ static int tunnel4_rcv(struct sk_buff *skb) 
	if (!pskb_may_pull(skb, sizeof(struct iphdr)))

		goto drop;



	for (handler = tunnel4_handlers; handler; handler = handler->next)

	for_each_tunnel_rcu(tunnel4_handlers, handler)

		if (!handler->handler(skb))

			return 0;
@@ -99,7 +104,7 @@ static int tunnel64_rcv(struct sk_buff *skb) 
	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))

		goto drop;



	for (handler = tunnel64_handlers; handler; handler = handler->next)

	for_each_tunnel_rcu(tunnel64_handlers, handler)

		if (!handler->handler(skb))

			return 0;
@@ -115,7 +120,7 @@ static void tunnel4_err(struct sk_buff *skb, u32 info) 
{

	struct xfrm_tunnel *handler;



	for (handler = tunnel4_handlers; handler; handler = handler->next)

	for_each_tunnel_rcu(tunnel4_handlers, handler)

		if (!handler->err_handler(skb, info))

			break;

}
@@ -125,7 +130,7 @@ static void tunnel64_err(struct sk_buff *skb, u32 info) 
{

	struct xfrm_tunnel *handler;



	for (handler = tunnel64_handlers; handler; handler = handler->next)

	for_each_tunnel_rcu(tunnel64_handlers, handler)

		if (!handler->err_handler(skb, info))

			break;

}

net/ipv6/tunnel6.c

+8 −3
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family) 


EXPORT_SYMBOL(xfrm6_tunnel_deregister);



#define for_each_tunnel_rcu(head, handler)		\

	for (handler = rcu_dereference(head);		\

	     handler != NULL;				\

	     handler = rcu_dereference(handler->next))	\



static int tunnel6_rcv(struct sk_buff *skb)

{

	struct xfrm6_tunnel *handler;
@@ -95,7 +100,7 @@ static int tunnel6_rcv(struct sk_buff *skb) 
	if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))

		goto drop;



	for (handler = tunnel6_handlers; handler; handler = handler->next)

	for_each_tunnel_rcu(tunnel6_handlers, handler)

		if (!handler->handler(skb))

			return 0;
@@ -113,7 +118,7 @@ static int tunnel46_rcv(struct sk_buff *skb) 
	if (!pskb_may_pull(skb, sizeof(struct iphdr)))

		goto drop;



	for (handler = tunnel46_handlers; handler; handler = handler->next)

	for_each_tunnel_rcu(tunnel46_handlers, handler)

		if (!handler->handler(skb))

			return 0;
@@ -129,7 +134,7 @@ static void tunnel6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
{

	struct xfrm6_tunnel *handler;



	for (handler = tunnel6_handlers; handler; handler = handler->next)

	for_each_tunnel_rcu(tunnel6_handlers, handler)

		if (!handler->err_handler(skb, opt, type, code, offset, info))

			break;

}