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

Commit d6a61ec9 authored by Guillaume Nault's avatar Guillaume Nault Committed by David S. Miller
Browse files

l2tp: define l2tp_tunnel_uses_xfrm() 



Use helper function to figure out if a tunnel is using ipsec.
Also, avoid accessing ->sk_policy directly since it's RCU protected.

Signed-off-by: default avatarGuillaume Nault <g.nault@alphalink.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a8982d1

net/l2tp/l2tp_core.h

+19 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,10 @@ 
#include <net/dst.h>

#include <net/dst.h>

#include <net/sock.h>

#include <net/sock.h>





#ifdef CONFIG_XFRM

#include <net/xfrm.h>

#endif



/* Just some random numbers */

/* Just some random numbers */

#define L2TP_TUNNEL_MAGIC	0x42114DDA

#define L2TP_TUNNEL_MAGIC	0x42114DDA

#define L2TP_SESSION_MAGIC	0x0C04EB7D

#define L2TP_SESSION_MAGIC	0x0C04EB7D
@@ -284,6 +288,21 @@ static inline u32 l2tp_tunnel_dst_mtu(const struct l2tp_tunnel *tunnel) 
	return mtu;

	return mtu;

}

}





#ifdef CONFIG_XFRM

static inline bool l2tp_tunnel_uses_xfrm(const struct l2tp_tunnel *tunnel)

{

	struct sock *sk = tunnel->sock;



	return sk && (rcu_access_pointer(sk->sk_policy[0]) ||

		      rcu_access_pointer(sk->sk_policy[1]));

}

#else

static inline bool l2tp_tunnel_uses_xfrm(const struct l2tp_tunnel *tunnel)

{

	return false;

}

#endif



#define l2tp_printk(ptr, type, func, fmt, ...)				\

#define l2tp_printk(ptr, type, func, fmt, ...)				\

do {									\

do {									\

	if (((ptr)->debug) & (type))					\

	if (((ptr)->debug) & (type))					\

net/l2tp/l2tp_netlink.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -710,9 +710,6 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl 
	void *hdr;

	void *hdr;

	struct nlattr *nest;

	struct nlattr *nest;

	struct l2tp_tunnel *tunnel = session->tunnel;

	struct l2tp_tunnel *tunnel = session->tunnel;

	struct sock *sk = NULL;



	sk = tunnel->sock;





	hdr = genlmsg_put(skb, portid, seq, &l2tp_nl_family, flags, cmd);

	hdr = genlmsg_put(skb, portid, seq, &l2tp_nl_family, flags, cmd);

	if (!hdr)

	if (!hdr)
@@ -738,10 +735,8 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl 
	    nla_put_u8(skb, L2TP_ATTR_RECV_SEQ, session->recv_seq) ||

	    nla_put_u8(skb, L2TP_ATTR_RECV_SEQ, session->recv_seq) ||

	    nla_put_u8(skb, L2TP_ATTR_SEND_SEQ, session->send_seq) ||

	    nla_put_u8(skb, L2TP_ATTR_SEND_SEQ, session->send_seq) ||

	    nla_put_u8(skb, L2TP_ATTR_LNS_MODE, session->lns_mode) ||

	    nla_put_u8(skb, L2TP_ATTR_LNS_MODE, session->lns_mode) ||

#ifdef CONFIG_XFRM

	    (l2tp_tunnel_uses_xfrm(tunnel) &&

	    (((sk) && (sk->sk_policy[0] || sk->sk_policy[1])) &&

	     nla_put_u8(skb, L2TP_ATTR_USING_IPSEC, 1)) ||

	     nla_put_u8(skb, L2TP_ATTR_USING_IPSEC, 1)) ||

#endif

	    (session->reorder_timeout &&

	    (session->reorder_timeout &&

	     nla_put_msecs(skb, L2TP_ATTR_RECV_TIMEOUT,

	     nla_put_msecs(skb, L2TP_ATTR_RECV_TIMEOUT,

			   session->reorder_timeout, L2TP_ATTR_PAD)))

			   session->reorder_timeout, L2TP_ATTR_PAD)))

net/l2tp/l2tp_ppp.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -95,7 +95,6 @@ 
#include <net/netns/generic.h>

#include <net/netns/generic.h>

#include <net/ip.h>

#include <net/ip.h>

#include <net/udp.h>

#include <net/udp.h>

#include <net/xfrm.h>

#include <net/inet_common.h>

#include <net/inet_common.h>





#include <asm/byteorder.h>

#include <asm/byteorder.h>
@@ -1153,9 +1152,7 @@ static int pppol2tp_tunnel_ioctl(struct l2tp_tunnel *tunnel, 
			l2tp_session_dec_refcount(session);

			l2tp_session_dec_refcount(session);

			break;

			break;

		}

		}

#ifdef CONFIG_XFRM

		stats.using_ipsec = l2tp_tunnel_uses_xfrm(tunnel);

		stats.using_ipsec = (sk->sk_policy[0] || sk->sk_policy[1]) ? 1 : 0;

#endif

		pppol2tp_copy_stats(&stats, &tunnel->stats);

		pppol2tp_copy_stats(&stats, &tunnel->stats);

		if (copy_to_user((void __user *) arg, &stats, sizeof(stats))) {

		if (copy_to_user((void __user *) arg, &stats, sizeof(stats))) {

			err = -EFAULT;

			err = -EFAULT;