2010-04-02 10:18:33 +04:00
/*****************************************************************************
* Linux PPP over L2TP ( PPPoX / PPPoL2TP ) Sockets
*
* PPPoX - - - Generic PPP encapsulation socket family
* PPPoL2TP - - - PPP over L2TP ( RFC 2661 )
*
* Version : 2.0 .0
*
* Authors : James Chapman ( jchapman @ katalix . com )
*
* Based on original work by Martijn van Oosterhout < kleptog @ svana . org >
*
* License :
* This program is free software ; you can redistribute it and / or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation ; either version
* 2 of the License , or ( at your option ) any later version .
*
*/
/* This driver handles only L2TP data frames; control frames are handled by a
* userspace application .
*
* To send data in an L2TP session , userspace opens a PPPoL2TP socket and
* attaches it to a bound UDP socket with local tunnel_id / session_id and
* peer tunnel_id / session_id set . Data can then be sent or received using
* regular socket sendmsg ( ) / recvmsg ( ) calls . Kernel parameters of the socket
* can be read or modified using ioctl ( ) or [ gs ] etsockopt ( ) calls .
*
* When a PPPoL2TP socket is connected with local and peer session_id values
* zero , the socket is treated as a special tunnel management socket .
*
* Here ' s example userspace code to create a socket for sending / receiving data
* over an L2TP session : -
*
* struct sockaddr_pppol2tp sax ;
* int fd ;
* int session_fd ;
*
* fd = socket ( AF_PPPOX , SOCK_DGRAM , PX_PROTO_OL2TP ) ;
*
* sax . sa_family = AF_PPPOX ;
* sax . sa_protocol = PX_PROTO_OL2TP ;
* sax . pppol2tp . fd = tunnel_fd ; // bound UDP socket
* sax . pppol2tp . addr . sin_addr . s_addr = addr - > sin_addr . s_addr ;
* sax . pppol2tp . addr . sin_port = addr - > sin_port ;
* sax . pppol2tp . addr . sin_family = AF_INET ;
* sax . pppol2tp . s_tunnel = tunnel_id ;
* sax . pppol2tp . s_session = session_id ;
* sax . pppol2tp . d_tunnel = peer_tunnel_id ;
* sax . pppol2tp . d_session = peer_session_id ;
*
* session_fd = connect ( fd , ( struct sockaddr * ) & sax , sizeof ( sax ) ) ;
*
* A pppd plugin that allows PPP traffic to be carried over L2TP using
* this driver is available from the OpenL2TP project at
* http : //openl2tp.sourceforge.net.
*/
2012-05-16 13:55:56 +04:00
# define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
2010-04-02 10:18:33 +04:00
# include <linux/module.h>
# include <linux/string.h>
# include <linux/list.h>
# include <linux/uaccess.h>
# include <linux/kernel.h>
# include <linux/spinlock.h>
# include <linux/kthread.h>
# include <linux/sched.h>
# include <linux/slab.h>
# include <linux/errno.h>
# include <linux/jiffies.h>
# include <linux/netdevice.h>
# include <linux/net.h>
# include <linux/inetdevice.h>
# include <linux/skbuff.h>
# include <linux/init.h>
# include <linux/ip.h>
# include <linux/udp.h>
# include <linux/if_pppox.h>
# include <linux/if_pppol2tp.h>
# include <net/sock.h>
# include <linux/ppp_channel.h>
# include <linux/ppp_defs.h>
2012-03-04 16:56:55 +04:00
# include <linux/ppp-ioctl.h>
2010-04-02 10:18:33 +04:00
# include <linux/file.h>
# include <linux/hash.h>
# include <linux/sort.h>
# include <linux/proc_fs.h>
2010-04-02 10:19:10 +04:00
# include <linux/l2tp.h>
2010-04-02 10:18:33 +04:00
# include <linux/nsproxy.h>
# include <net/net_namespace.h>
# include <net/netns/generic.h>
# include <net/dst.h>
# include <net/ip.h>
# include <net/udp.h>
# include <net/xfrm.h>
2013-03-19 10:11:21 +04:00
# include <net/inet_common.h>
2010-04-02 10:18:33 +04:00
# include <asm/byteorder.h>
2011-07-27 03:09:06 +04:00
# include <linux/atomic.h>
2010-04-02 10:18:33 +04:00
# include "l2tp_core.h"
# define PPPOL2TP_DRV_VERSION "V2.0"
/* Space for UDP, L2TP and PPP headers */
# define PPPOL2TP_HEADER_OVERHEAD 40
/* Number of bytes to build transmit L2TP headers.
* Unfortunately the size is different depending on whether sequence numbers
* are enabled .
*/
# define PPPOL2TP_L2TP_HDR_SIZE_SEQ 10
# define PPPOL2TP_L2TP_HDR_SIZE_NOSEQ 6
/* Private data of each session. This data lives at the end of struct
* l2tp_session , referenced via session - > priv [ ] .
*/
struct pppol2tp_session {
int owner ; /* pid that opened the socket */
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
struct mutex sk_lock ; /* Protects .sk */
struct sock __rcu * sk ; /* Pointer to the session
2010-04-02 10:18:33 +04:00
* PPPoX socket */
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
struct sock * __sk ; /* Copy of .sk, for cleanup */
struct rcu_head rcu ; /* For asynchronous release */
2010-04-02 10:18:33 +04:00
int flags ; /* accessed by PPPIOCGFLAGS.
* Unused . */
} ;
static int pppol2tp_xmit ( struct ppp_channel * chan , struct sk_buff * skb ) ;
2010-08-04 11:34:36 +04:00
static const struct ppp_channel_ops pppol2tp_chan_ops = {
. start_xmit = pppol2tp_xmit ,
} ;
2010-04-02 10:18:33 +04:00
static const struct proto_ops pppol2tp_ops ;
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
/* Retrieves the pppol2tp socket associated to a session.
* A reference is held on the returned socket , so this function must be paired
* with sock_put ( ) .
*/
static struct sock * pppol2tp_session_get_sock ( struct l2tp_session * session )
{
struct pppol2tp_session * ps = l2tp_session_priv ( session ) ;
struct sock * sk ;
rcu_read_lock ( ) ;
sk = rcu_dereference ( ps - > sk ) ;
if ( sk )
sock_hold ( sk ) ;
rcu_read_unlock ( ) ;
return sk ;
}
2010-04-02 10:18:33 +04:00
/* Helpers to obtain tunnel/session contexts from sockets.
*/
static inline struct l2tp_session * pppol2tp_sock_to_session ( struct sock * sk )
{
struct l2tp_session * session ;
if ( sk = = NULL )
return NULL ;
sock_hold ( sk ) ;
session = ( struct l2tp_session * ) ( sk - > sk_user_data ) ;
if ( session = = NULL ) {
sock_put ( sk ) ;
goto out ;
}
BUG_ON ( session - > magic ! = L2TP_SESSION_MAGIC ) ;
out :
return session ;
}
/*****************************************************************************
* Receive data handling
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
static int pppol2tp_recv_payload_hook ( struct sk_buff * skb )
{
/* Skip PPP header, if present. In testing, Microsoft L2TP clients
* don ' t send the PPP header ( PPP header compression enabled ) , but
* other clients can include the header . So we cope with both cases
* here . The PPP header is always FF03 when using L2TP .
*
* Note that skb - > data [ ] isn ' t dereferenced from a u16 ptr here since
* the field may be unaligned .
*/
if ( ! pskb_may_pull ( skb , 2 ) )
return 1 ;
2016-08-22 17:50:02 +03:00
if ( ( skb - > data [ 0 ] = = PPP_ALLSTATIONS ) & & ( skb - > data [ 1 ] = = PPP_UI ) )
2010-04-02 10:18:33 +04:00
skb_pull ( skb , 2 ) ;
return 0 ;
}
/* Receive message. This is the recvmsg for the PPPoL2TP socket.
*/
2015-03-02 10:37:48 +03:00
static int pppol2tp_recvmsg ( struct socket * sock , struct msghdr * msg ,
size_t len , int flags )
2010-04-02 10:18:33 +04:00
{
int err ;
struct sk_buff * skb ;
struct sock * sk = sock - > sk ;
err = - EIO ;
if ( sk - > sk_state & PPPOX_BOUND )
goto end ;
err = 0 ;
skb = skb_recv_datagram ( sk , flags & ~ MSG_DONTWAIT ,
flags & MSG_DONTWAIT , & err ) ;
if ( ! skb )
goto end ;
if ( len > skb - > len )
len = skb - > len ;
else if ( len < skb - > len )
msg - > msg_flags | = MSG_TRUNC ;
2014-11-06 00:46:40 +03:00
err = skb_copy_datagram_msg ( skb , 0 , msg , len ) ;
2010-04-02 10:18:33 +04:00
if ( likely ( err = = 0 ) )
err = len ;
kfree_skb ( skb ) ;
end :
return err ;
}
static void pppol2tp_recv ( struct l2tp_session * session , struct sk_buff * skb , int data_len )
{
struct pppol2tp_session * ps = l2tp_session_priv ( session ) ;
struct sock * sk = NULL ;
/* If the socket is bound, send it in to PPP's input queue. Otherwise
* queue it on the session socket .
*/
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
rcu_read_lock ( ) ;
sk = rcu_dereference ( ps - > sk ) ;
2010-04-02 10:18:33 +04:00
if ( sk = = NULL )
goto no_sock ;
if ( sk - > sk_state & PPPOX_BOUND ) {
struct pppox_sock * po ;
2015-12-29 15:06:59 +03:00
2016-12-11 03:18:59 +03:00
l2tp_dbg ( session , L2TP_MSG_DATA ,
2012-05-16 13:55:56 +04:00
" %s: recv %d byte data frame, passing to ppp \n " ,
session - > name , data_len ) ;
2010-04-02 10:18:33 +04:00
po = pppox_sk ( sk ) ;
ppp_input ( & po - > chan , skb ) ;
} else {
2016-12-11 03:18:59 +03:00
l2tp_dbg ( session , L2TP_MSG_DATA ,
2014-03-06 14:15:10 +04:00
" %s: recv %d byte data frame, passing to L2TP socket \n " ,
session - > name , data_len ) ;
2010-04-02 10:18:33 +04:00
2014-03-06 14:15:10 +04:00
if ( sock_queue_rcv_skb ( sk , skb ) < 0 ) {
atomic_long_inc ( & session - > stats . rx_errors ) ;
kfree_skb ( skb ) ;
}
2010-04-02 10:18:33 +04:00
}
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
rcu_read_unlock ( ) ;
2010-04-02 10:18:33 +04:00
return ;
no_sock :
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
rcu_read_unlock ( ) ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_DATA , " %s: no socket \n " , session - > name ) ;
2010-04-02 10:18:33 +04:00
kfree_skb ( skb ) ;
}
/************************************************************************
* Transmit handling
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* This is the sendmsg for the PPPoL2TP pppol2tp_session socket. We come here
* when a user application does a sendmsg ( ) on the session socket . L2TP and
* PPP headers must be inserted into the user ' s data .
*/
2015-03-02 10:37:48 +03:00
static int pppol2tp_sendmsg ( struct socket * sock , struct msghdr * m ,
2010-04-02 10:18:33 +04:00
size_t total_len )
{
struct sock * sk = sock - > sk ;
struct sk_buff * skb ;
int error ;
struct l2tp_session * session ;
struct l2tp_tunnel * tunnel ;
2010-04-02 10:19:00 +04:00
int uhlen ;
2010-04-02 10:18:33 +04:00
error = - ENOTCONN ;
if ( sock_flag ( sk , SOCK_DEAD ) | | ! ( sk - > sk_state & PPPOX_CONNECTED ) )
goto error ;
/* Get session and tunnel contexts */
error = - EBADF ;
session = pppol2tp_sock_to_session ( sk ) ;
if ( session = = NULL )
goto error ;
2017-11-11 00:06:31 +03:00
tunnel = session - > tunnel ;
2010-04-02 10:18:33 +04:00
2010-04-02 10:19:00 +04:00
uhlen = ( tunnel - > encap = = L2TP_ENCAPTYPE_UDP ) ? sizeof ( struct udphdr ) : 0 ;
2010-04-02 10:18:33 +04:00
/* Allocate a socket buffer */
error = - ENOMEM ;
skb = sock_wmalloc ( sk , NET_SKB_PAD + sizeof ( struct iphdr ) +
2010-04-02 10:19:00 +04:00
uhlen + session - > hdr_len +
2016-08-22 17:50:02 +03:00
2 + total_len , /* 2 bytes for PPP_ALLSTATIONS & PPP_UI */
2010-04-02 10:18:33 +04:00
0 , GFP_KERNEL ) ;
if ( ! skb )
2017-11-11 00:06:31 +03:00
goto error_put_sess ;
2010-04-02 10:18:33 +04:00
/* Reserve space for headers. */
skb_reserve ( skb , NET_SKB_PAD ) ;
skb_reset_network_header ( skb ) ;
skb_reserve ( skb , sizeof ( struct iphdr ) ) ;
skb_reset_transport_header ( skb ) ;
2010-04-02 10:19:00 +04:00
skb_reserve ( skb , uhlen ) ;
2010-04-02 10:18:33 +04:00
/* Add PPP header */
2016-08-22 17:50:02 +03:00
skb - > data [ 0 ] = PPP_ALLSTATIONS ;
skb - > data [ 1 ] = PPP_UI ;
2010-04-02 10:18:33 +04:00
skb_put ( skb , 2 ) ;
/* Copy user data into skb */
2014-04-07 05:25:44 +04:00
error = memcpy_from_msg ( skb_put ( skb , total_len ) , m , total_len ) ;
2010-04-02 10:18:33 +04:00
if ( error < 0 ) {
kfree_skb ( skb ) ;
2017-11-11 00:06:31 +03:00
goto error_put_sess ;
2010-04-02 10:18:33 +04:00
}
2013-10-10 17:30:09 +04:00
local_bh_disable ( ) ;
2010-04-02 10:18:33 +04:00
l2tp_xmit_skb ( session , skb , session - > hdr_len ) ;
2013-10-10 17:30:09 +04:00
local_bh_enable ( ) ;
2010-04-02 10:18:33 +04:00
2013-03-01 09:02:02 +04:00
sock_put ( sk ) ;
2010-04-02 10:18:33 +04:00
2013-06-12 18:07:36 +04:00
return total_len ;
2010-04-02 10:18:33 +04:00
error_put_sess :
sock_put ( sk ) ;
error :
return error ;
}
/* Transmit function called by generic PPP driver. Sends PPP frame
* over PPPoL2TP socket .
*
* This is almost the same as pppol2tp_sendmsg ( ) , but rather than
* being called with a msghdr from userspace , it is called with a skb
* from the kernel .
*
* The supplied skb from ppp doesn ' t have enough headroom for the
* insertion of L2TP , UDP and IP headers so we need to allocate more
* headroom in the skb . This will create a cloned skb . But we must be
* careful in the error case because the caller will expect to free
* the skb it supplied , not our cloned skb . So we take care to always
* leave the original skb unfreed if we return an error .
*/
static int pppol2tp_xmit ( struct ppp_channel * chan , struct sk_buff * skb )
{
struct sock * sk = ( struct sock * ) chan - > private ;
struct l2tp_session * session ;
struct l2tp_tunnel * tunnel ;
2011-10-07 09:45:57 +04:00
int uhlen , headroom ;
2010-04-02 10:18:33 +04:00
if ( sock_flag ( sk , SOCK_DEAD ) | | ! ( sk - > sk_state & PPPOX_CONNECTED ) )
goto abort ;
/* Get session and tunnel contexts from the socket */
session = pppol2tp_sock_to_session ( sk ) ;
if ( session = = NULL )
goto abort ;
2017-11-11 00:06:31 +03:00
tunnel = session - > tunnel ;
2010-04-02 10:18:33 +04:00
2011-10-07 09:45:57 +04:00
uhlen = ( tunnel - > encap = = L2TP_ENCAPTYPE_UDP ) ? sizeof ( struct udphdr ) : 0 ;
headroom = NET_SKB_PAD +
sizeof ( struct iphdr ) + /* IP header */
uhlen + /* UDP header (if L2TP_ENCAPTYPE_UDP) */
session - > hdr_len + /* L2TP header */
2016-08-22 17:50:02 +03:00
2 ; /* 2 bytes for PPP_ALLSTATIONS & PPP_UI */
2011-10-07 09:45:57 +04:00
if ( skb_cow_head ( skb , headroom ) )
2017-11-11 00:06:31 +03:00
goto abort_put_sess ;
2010-04-02 10:18:33 +04:00
/* Setup PPP header */
2016-08-22 17:50:02 +03:00
__skb_push ( skb , 2 ) ;
skb - > data [ 0 ] = PPP_ALLSTATIONS ;
skb - > data [ 1 ] = PPP_UI ;
2010-04-02 10:18:33 +04:00
2013-10-10 17:30:09 +04:00
local_bh_disable ( ) ;
2010-04-02 10:18:54 +04:00
l2tp_xmit_skb ( session , skb , session - > hdr_len ) ;
2013-10-10 17:30:09 +04:00
local_bh_enable ( ) ;
2010-04-02 10:18:33 +04:00
sock_put ( sk ) ;
2017-11-11 00:06:31 +03:00
2010-04-02 10:18:33 +04:00
return 1 ;
abort_put_sess :
sock_put ( sk ) ;
abort :
/* Free the original skb */
kfree_skb ( skb ) ;
return 1 ;
}
/*****************************************************************************
* Session ( and tunnel control ) socket create / destroy .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* Called by l2tp_core when a session socket is being closed.
*/
static void pppol2tp_session_close ( struct l2tp_session * session )
{
}
/* Really kill the session socket. (Called from sock_put() if
* refcnt = = 0. )
*/
static void pppol2tp_session_destruct ( struct sock * sk )
{
2013-03-19 10:11:23 +04:00
struct l2tp_session * session = sk - > sk_user_data ;
2017-03-29 09:45:29 +03:00
skb_queue_purge ( & sk - > sk_receive_queue ) ;
skb_queue_purge ( & sk - > sk_write_queue ) ;
2013-03-19 10:11:23 +04:00
if ( session ) {
2010-04-02 10:18:33 +04:00
sk - > sk_user_data = NULL ;
BUG_ON ( session - > magic ! = L2TP_SESSION_MAGIC ) ;
l2tp_session_dec_refcount ( session ) ;
}
}
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
static void pppol2tp_put_sk ( struct rcu_head * head )
{
struct pppol2tp_session * ps ;
ps = container_of ( head , typeof ( * ps ) , rcu ) ;
sock_put ( ps - > __sk ) ;
}
2010-04-02 10:18:33 +04:00
/* Called when the PPPoX socket (session) is closed.
*/
static int pppol2tp_release ( struct socket * sock )
{
struct sock * sk = sock - > sk ;
struct l2tp_session * session ;
int error ;
if ( ! sk )
return 0 ;
error = - EBADF ;
lock_sock ( sk ) ;
if ( sock_flag ( sk , SOCK_DEAD ) ! = 0 )
goto error ;
pppox_unbind_sock ( sk ) ;
/* Signal the death of the socket. */
sk - > sk_state = PPPOX_DEAD ;
sock_orphan ( sk ) ;
sock - > sk = NULL ;
session = pppol2tp_sock_to_session ( sk ) ;
if ( session ! = NULL ) {
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
struct pppol2tp_session * ps ;
l2tp: initialise PPP sessions before registering them
pppol2tp_connect() initialises L2TP sessions after they've been exposed
to the rest of the system by l2tp_session_register(). This puts
sessions into transient states that are the source of several races, in
particular with session's deletion path.
This patch centralises the initialisation code into
pppol2tp_session_init(), which is called before the registration phase.
The only field that can't be set before session registration is the
pppol2tp socket pointer, which has already been converted to RCU. So
pppol2tp_connect() should now be race-free.
The session's .session_close() callback is now set before registration.
Therefore, it's always called when l2tp_core deletes the session, even
if it was created by pppol2tp_session_create() and hasn't been plugged
to a pppol2tp socket yet. That'd prevent session free because the extra
reference taken by pppol2tp_session_close() wouldn't be dropped by the
socket's ->sk_destruct() callback (pppol2tp_session_destruct()).
We could set .session_close() only while connecting a session to its
pppol2tp socket, or teach pppol2tp_session_close() to avoid grabbing a
reference when the session isn't connected, but that'd require adding
some form of synchronisation to be race free.
Instead of that, we can just let the pppol2tp socket hold a reference
on the session as soon as it starts depending on it (that is, in
pppol2tp_connect()). Then we don't need to utilise
pppol2tp_session_close() to hold a reference at the last moment to
prevent l2tp_core from dropping it.
When releasing the socket, pppol2tp_release() now deletes the session
using the standard l2tp_session_delete() function, instead of merely
removing it from hash tables. l2tp_session_delete() drops the reference
the sessions holds on itself, but also makes sure it doesn't remove a
session twice. So it can safely be called, even if l2tp_core already
tried, or is concurrently trying, to remove the session.
Finally, pppol2tp_session_destruct() drops the reference held by the
socket.
Fixes: fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts")
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
l2tp_session_delete ( session ) ;
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
ps = l2tp_session_priv ( session ) ;
mutex_lock ( & ps - > sk_lock ) ;
ps - > __sk = rcu_dereference_protected ( ps - > sk ,
lockdep_is_held ( & ps - > sk_lock ) ) ;
RCU_INIT_POINTER ( ps - > sk , NULL ) ;
mutex_unlock ( & ps - > sk_lock ) ;
call_rcu ( & ps - > rcu , pppol2tp_put_sk ) ;
/* Rely on the sock_put() call at the end of the function for
* dropping the reference held by pppol2tp_sock_to_session ( ) .
* The last reference will be dropped by pppol2tp_put_sk ( ) .
*/
2010-04-02 10:18:33 +04:00
}
release_sock ( sk ) ;
/* This will delete the session context via
* pppol2tp_session_destruct ( ) if the socket ' s refcnt drops to
* zero .
*/
sock_put ( sk ) ;
return 0 ;
error :
release_sock ( sk ) ;
return error ;
}
static struct proto pppol2tp_sk_proto = {
. name = " PPPOL2TP " ,
. owner = THIS_MODULE ,
. obj_size = sizeof ( struct pppox_sock ) ,
} ;
static int pppol2tp_backlog_recv ( struct sock * sk , struct sk_buff * skb )
{
int rc ;
rc = l2tp_udp_encap_recv ( sk , skb ) ;
if ( rc )
kfree_skb ( skb ) ;
return NET_RX_SUCCESS ;
}
/* socket() handler. Initialize a new struct sock.
*/
2015-05-09 05:09:13 +03:00
static int pppol2tp_create ( struct net * net , struct socket * sock , int kern )
2010-04-02 10:18:33 +04:00
{
int error = - ENOMEM ;
struct sock * sk ;
2015-05-09 05:09:13 +03:00
sk = sk_alloc ( net , PF_PPPOX , GFP_KERNEL , & pppol2tp_sk_proto , kern ) ;
2010-04-02 10:18:33 +04:00
if ( ! sk )
goto out ;
sock_init_data ( sock , sk ) ;
sock - > state = SS_UNCONNECTED ;
sock - > ops = & pppol2tp_ops ;
sk - > sk_backlog_rcv = pppol2tp_backlog_recv ;
sk - > sk_protocol = PX_PROTO_OL2TP ;
sk - > sk_family = PF_PPPOX ;
sk - > sk_state = PPPOX_NONE ;
sk - > sk_type = SOCK_STREAM ;
sk - > sk_destruct = pppol2tp_session_destruct ;
error = 0 ;
out :
return error ;
}
2016-09-09 15:43:17 +03:00
# if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
2010-04-02 10:19:33 +04:00
static void pppol2tp_show ( struct seq_file * m , void * arg )
{
struct l2tp_session * session = arg ;
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
struct sock * sk ;
sk = pppol2tp_session_get_sock ( session ) ;
if ( sk ) {
struct pppox_sock * po = pppox_sk ( sk ) ;
2010-04-02 10:19:33 +04:00
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
seq_printf ( m , " interface %s \n " , ppp_dev_name ( & po - > chan ) ) ;
sock_put ( sk ) ;
2010-04-02 10:19:33 +04:00
}
}
# endif
l2tp: initialise PPP sessions before registering them
pppol2tp_connect() initialises L2TP sessions after they've been exposed
to the rest of the system by l2tp_session_register(). This puts
sessions into transient states that are the source of several races, in
particular with session's deletion path.
This patch centralises the initialisation code into
pppol2tp_session_init(), which is called before the registration phase.
The only field that can't be set before session registration is the
pppol2tp socket pointer, which has already been converted to RCU. So
pppol2tp_connect() should now be race-free.
The session's .session_close() callback is now set before registration.
Therefore, it's always called when l2tp_core deletes the session, even
if it was created by pppol2tp_session_create() and hasn't been plugged
to a pppol2tp socket yet. That'd prevent session free because the extra
reference taken by pppol2tp_session_close() wouldn't be dropped by the
socket's ->sk_destruct() callback (pppol2tp_session_destruct()).
We could set .session_close() only while connecting a session to its
pppol2tp socket, or teach pppol2tp_session_close() to avoid grabbing a
reference when the session isn't connected, but that'd require adding
some form of synchronisation to be race free.
Instead of that, we can just let the pppol2tp socket hold a reference
on the session as soon as it starts depending on it (that is, in
pppol2tp_connect()). Then we don't need to utilise
pppol2tp_session_close() to hold a reference at the last moment to
prevent l2tp_core from dropping it.
When releasing the socket, pppol2tp_release() now deletes the session
using the standard l2tp_session_delete() function, instead of merely
removing it from hash tables. l2tp_session_delete() drops the reference
the sessions holds on itself, but also makes sure it doesn't remove a
session twice. So it can safely be called, even if l2tp_core already
tried, or is concurrently trying, to remove the session.
Finally, pppol2tp_session_destruct() drops the reference held by the
socket.
Fixes: fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts")
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
static void pppol2tp_session_init ( struct l2tp_session * session )
{
struct pppol2tp_session * ps ;
struct dst_entry * dst ;
session - > recv_skb = pppol2tp_recv ;
session - > session_close = pppol2tp_session_close ;
# if IS_ENABLED(CONFIG_L2TP_DEBUGFS)
session - > show = pppol2tp_show ;
# endif
ps = l2tp_session_priv ( session ) ;
mutex_init ( & ps - > sk_lock ) ;
ps - > owner = current - > pid ;
/* If PMTU discovery was enabled, use the MTU that was discovered */
dst = sk_dst_get ( session - > tunnel - > sock ) ;
if ( dst ) {
u32 pmtu = dst_mtu ( dst ) ;
if ( pmtu ) {
session - > mtu = pmtu - PPPOL2TP_HEADER_OVERHEAD ;
session - > mru = pmtu - PPPOL2TP_HEADER_OVERHEAD ;
}
dst_release ( dst ) ;
}
}
2010-04-02 10:18:33 +04:00
/* connect() handler. Attach a PPPoX socket to a tunnel UDP socket
*/
static int pppol2tp_connect ( struct socket * sock , struct sockaddr * uservaddr ,
int sockaddr_len , int flags )
{
struct sock * sk = sock - > sk ;
struct sockaddr_pppol2tp * sp = ( struct sockaddr_pppol2tp * ) uservaddr ;
struct pppox_sock * po = pppox_sk ( sk ) ;
struct l2tp_session * session = NULL ;
struct l2tp_tunnel * tunnel ;
struct pppol2tp_session * ps ;
struct l2tp_session_cfg cfg = { 0 , } ;
int error = 0 ;
2010-04-02 10:18:54 +04:00
u32 tunnel_id , peer_tunnel_id ;
u32 session_id , peer_session_id ;
2017-03-31 14:02:27 +03:00
bool drop_refcnt = false ;
2017-10-30 19:58:58 +03:00
bool drop_tunnel = false ;
2010-04-02 10:18:54 +04:00
int ver = 2 ;
int fd ;
2010-04-02 10:18:33 +04:00
lock_sock ( sk ) ;
error = - EINVAL ;
if ( sp - > sa_protocol ! = PX_PROTO_OL2TP )
goto end ;
/* Check for already bound sockets */
error = - EBUSY ;
if ( sk - > sk_state & PPPOX_CONNECTED )
goto end ;
/* We don't supporting rebinding anyway */
error = - EALREADY ;
if ( sk - > sk_user_data )
goto end ; /* socket is already attached */
2012-04-30 01:48:50 +04:00
/* Get params from socket address. Handle L2TPv2 and L2TPv3.
* This is nasty because there are different sockaddr_pppol2tp
* structs for L2TPv2 , L2TPv3 , over IPv4 and IPv6 . We use
* the sockaddr size to determine which structure the caller
* is using .
*/
peer_tunnel_id = 0 ;
2010-04-02 10:18:54 +04:00
if ( sockaddr_len = = sizeof ( struct sockaddr_pppol2tp ) ) {
fd = sp - > pppol2tp . fd ;
tunnel_id = sp - > pppol2tp . s_tunnel ;
peer_tunnel_id = sp - > pppol2tp . d_tunnel ;
session_id = sp - > pppol2tp . s_session ;
peer_session_id = sp - > pppol2tp . d_session ;
} else if ( sockaddr_len = = sizeof ( struct sockaddr_pppol2tpv3 ) ) {
2012-04-30 01:48:50 +04:00
struct sockaddr_pppol2tpv3 * sp3 =
( struct sockaddr_pppol2tpv3 * ) sp ;
2010-04-02 10:18:54 +04:00
ver = 3 ;
fd = sp3 - > pppol2tp . fd ;
tunnel_id = sp3 - > pppol2tp . s_tunnel ;
peer_tunnel_id = sp3 - > pppol2tp . d_tunnel ;
session_id = sp3 - > pppol2tp . s_session ;
peer_session_id = sp3 - > pppol2tp . d_session ;
2012-04-30 01:48:50 +04:00
} else if ( sockaddr_len = = sizeof ( struct sockaddr_pppol2tpin6 ) ) {
struct sockaddr_pppol2tpin6 * sp6 =
( struct sockaddr_pppol2tpin6 * ) sp ;
fd = sp6 - > pppol2tp . fd ;
tunnel_id = sp6 - > pppol2tp . s_tunnel ;
peer_tunnel_id = sp6 - > pppol2tp . d_tunnel ;
session_id = sp6 - > pppol2tp . s_session ;
peer_session_id = sp6 - > pppol2tp . d_session ;
} else if ( sockaddr_len = = sizeof ( struct sockaddr_pppol2tpv3in6 ) ) {
struct sockaddr_pppol2tpv3in6 * sp6 =
( struct sockaddr_pppol2tpv3in6 * ) sp ;
ver = 3 ;
fd = sp6 - > pppol2tp . fd ;
tunnel_id = sp6 - > pppol2tp . s_tunnel ;
peer_tunnel_id = sp6 - > pppol2tp . d_tunnel ;
session_id = sp6 - > pppol2tp . s_session ;
peer_session_id = sp6 - > pppol2tp . d_session ;
2010-04-02 10:18:54 +04:00
} else {
error = - EINVAL ;
goto end ; /* bad socket address */
}
/* Don't bind if tunnel_id is 0 */
2010-04-02 10:18:33 +04:00
error = - EINVAL ;
2010-04-02 10:18:54 +04:00
if ( tunnel_id = = 0 )
2010-04-02 10:18:33 +04:00
goto end ;
2017-10-30 19:58:58 +03:00
tunnel = l2tp_tunnel_get ( sock_net ( sk ) , tunnel_id ) ;
if ( tunnel )
drop_tunnel = true ;
2010-04-02 10:19:10 +04:00
2010-04-02 10:18:54 +04:00
/* Special case: create tunnel context if session_id and
* peer_session_id is 0. Otherwise look up tunnel using supplied
2010-04-02 10:18:33 +04:00
* tunnel id .
*/
2010-04-02 10:18:54 +04:00
if ( ( session_id = = 0 ) & & ( peer_session_id = = 0 ) ) {
2010-04-02 10:19:10 +04:00
if ( tunnel = = NULL ) {
struct l2tp_tunnel_cfg tcfg = {
. encap = L2TP_ENCAPTYPE_UDP ,
. debug = 0 ,
} ;
error = l2tp_tunnel_create ( sock_net ( sk ) , fd , ver , tunnel_id , peer_tunnel_id , & tcfg , & tunnel ) ;
if ( error < 0 )
goto end ;
}
2010-04-02 10:18:33 +04:00
} else {
/* Error if we can't find the tunnel */
error = - ENOENT ;
if ( tunnel = = NULL )
goto end ;
/* Error if socket is not prepped */
if ( tunnel - > sock = = NULL )
goto end ;
}
if ( tunnel - > recv_payload_hook = = NULL )
tunnel - > recv_payload_hook = pppol2tp_recv_payload_hook ;
2012-04-30 01:48:50 +04:00
if ( tunnel - > peer_tunnel_id = = 0 )
tunnel - > peer_tunnel_id = peer_tunnel_id ;
2010-04-02 10:18:33 +04:00
2017-10-31 19:36:42 +03:00
session = l2tp_session_get ( sock_net ( sk ) , tunnel , session_id ) ;
2017-03-31 14:02:27 +03:00
if ( session ) {
drop_refcnt = true ;
ps = l2tp_session_priv ( session ) ;
/* Using a pre-existing session is fine as long as it hasn't
* been connected yet .
2010-04-02 10:19:10 +04:00
*/
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
mutex_lock ( & ps - > sk_lock ) ;
if ( rcu_dereference_protected ( ps - > sk ,
lockdep_is_held ( & ps - > sk_lock ) ) ) {
mutex_unlock ( & ps - > sk_lock ) ;
2017-03-31 14:02:27 +03:00
error = - EEXIST ;
goto end ;
}
2010-04-02 10:19:10 +04:00
} else {
2017-03-31 14:02:27 +03:00
/* Default MTU must allow space for UDP/L2TP/PPP headers */
cfg . mtu = 1500 - PPPOL2TP_HEADER_OVERHEAD ;
cfg . mru = cfg . mtu ;
2010-04-02 10:19:10 +04:00
2017-03-31 14:02:27 +03:00
session = l2tp_session_create ( sizeof ( struct pppol2tp_session ) ,
tunnel , session_id ,
peer_session_id , & cfg ) ;
if ( IS_ERR ( session ) ) {
error = PTR_ERR ( session ) ;
2010-04-02 10:19:10 +04:00
goto end ;
2017-03-31 14:02:27 +03:00
}
2017-10-27 17:51:50 +03:00
l2tp: initialise PPP sessions before registering them
pppol2tp_connect() initialises L2TP sessions after they've been exposed
to the rest of the system by l2tp_session_register(). This puts
sessions into transient states that are the source of several races, in
particular with session's deletion path.
This patch centralises the initialisation code into
pppol2tp_session_init(), which is called before the registration phase.
The only field that can't be set before session registration is the
pppol2tp socket pointer, which has already been converted to RCU. So
pppol2tp_connect() should now be race-free.
The session's .session_close() callback is now set before registration.
Therefore, it's always called when l2tp_core deletes the session, even
if it was created by pppol2tp_session_create() and hasn't been plugged
to a pppol2tp socket yet. That'd prevent session free because the extra
reference taken by pppol2tp_session_close() wouldn't be dropped by the
socket's ->sk_destruct() callback (pppol2tp_session_destruct()).
We could set .session_close() only while connecting a session to its
pppol2tp socket, or teach pppol2tp_session_close() to avoid grabbing a
reference when the session isn't connected, but that'd require adding
some form of synchronisation to be race free.
Instead of that, we can just let the pppol2tp socket hold a reference
on the session as soon as it starts depending on it (that is, in
pppol2tp_connect()). Then we don't need to utilise
pppol2tp_session_close() to hold a reference at the last moment to
prevent l2tp_core from dropping it.
When releasing the socket, pppol2tp_release() now deletes the session
using the standard l2tp_session_delete() function, instead of merely
removing it from hash tables. l2tp_session_delete() drops the reference
the sessions holds on itself, but also makes sure it doesn't remove a
session twice. So it can safely be called, even if l2tp_core already
tried, or is concurrently trying, to remove the session.
Finally, pppol2tp_session_destruct() drops the reference held by the
socket.
Fixes: fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts")
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
pppol2tp_session_init ( session ) ;
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
ps = l2tp_session_priv ( session ) ;
2017-10-27 17:51:50 +03:00
l2tp_session_inc_refcount ( session ) ;
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
mutex_lock ( & ps - > sk_lock ) ;
2017-10-27 17:51:50 +03:00
error = l2tp_session_register ( session , tunnel ) ;
if ( error < 0 ) {
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
mutex_unlock ( & ps - > sk_lock ) ;
2017-10-27 17:51:50 +03:00
kfree ( session ) ;
goto end ;
}
drop_refcnt = true ;
2010-04-02 10:18:33 +04:00
}
/* Special case: if source & dest session_id == 0x0000, this
* socket is being created to manage the tunnel . Just set up
* the internal context for use by ioctl ( ) and sockopt ( )
* handlers .
*/
if ( ( session - > session_id = = 0 ) & &
( session - > peer_session_id = = 0 ) ) {
error = 0 ;
goto out_no_ppp ;
}
/* The only header we need to worry about is the L2TP
* header . This size is different depending on whether
* sequence numbers are enabled for the data channel .
*/
po - > chan . hdrlen = PPPOL2TP_L2TP_HDR_SIZE_NOSEQ ;
po - > chan . private = sk ;
po - > chan . ops = & pppol2tp_chan_ops ;
po - > chan . mtu = session - > mtu ;
error = ppp_register_net_channel ( sock_net ( sk ) , & po - > chan ) ;
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
if ( error ) {
mutex_unlock ( & ps - > sk_lock ) ;
2010-04-02 10:18:33 +04:00
goto end ;
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
}
2010-04-02 10:18:33 +04:00
out_no_ppp :
/* This is how we get the session context from the socket. */
sk - > sk_user_data = session ;
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
rcu_assign_pointer ( ps - > sk , sk ) ;
mutex_unlock ( & ps - > sk_lock ) ;
l2tp: initialise PPP sessions before registering them
pppol2tp_connect() initialises L2TP sessions after they've been exposed
to the rest of the system by l2tp_session_register(). This puts
sessions into transient states that are the source of several races, in
particular with session's deletion path.
This patch centralises the initialisation code into
pppol2tp_session_init(), which is called before the registration phase.
The only field that can't be set before session registration is the
pppol2tp socket pointer, which has already been converted to RCU. So
pppol2tp_connect() should now be race-free.
The session's .session_close() callback is now set before registration.
Therefore, it's always called when l2tp_core deletes the session, even
if it was created by pppol2tp_session_create() and hasn't been plugged
to a pppol2tp socket yet. That'd prevent session free because the extra
reference taken by pppol2tp_session_close() wouldn't be dropped by the
socket's ->sk_destruct() callback (pppol2tp_session_destruct()).
We could set .session_close() only while connecting a session to its
pppol2tp socket, or teach pppol2tp_session_close() to avoid grabbing a
reference when the session isn't connected, but that'd require adding
some form of synchronisation to be race free.
Instead of that, we can just let the pppol2tp socket hold a reference
on the session as soon as it starts depending on it (that is, in
pppol2tp_connect()). Then we don't need to utilise
pppol2tp_session_close() to hold a reference at the last moment to
prevent l2tp_core from dropping it.
When releasing the socket, pppol2tp_release() now deletes the session
using the standard l2tp_session_delete() function, instead of merely
removing it from hash tables. l2tp_session_delete() drops the reference
the sessions holds on itself, but also makes sure it doesn't remove a
session twice. So it can safely be called, even if l2tp_core already
tried, or is concurrently trying, to remove the session.
Finally, pppol2tp_session_destruct() drops the reference held by the
socket.
Fixes: fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts")
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
/* Keep the reference we've grabbed on the session: sk doesn't expect
* the session to disappear . pppol2tp_session_destruct ( ) is responsible
* for dropping it .
*/
drop_refcnt = false ;
2010-04-02 10:18:33 +04:00
sk - > sk_state = PPPOX_CONNECTED ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL , " %s: created \n " ,
2012-05-16 13:55:56 +04:00
session - > name ) ;
2010-04-02 10:18:33 +04:00
end :
2017-03-31 14:02:27 +03:00
if ( drop_refcnt )
l2tp_session_dec_refcount ( session ) ;
2017-10-30 19:58:58 +03:00
if ( drop_tunnel )
l2tp_tunnel_dec_refcount ( tunnel ) ;
2010-04-02 10:18:33 +04:00
release_sock ( sk ) ;
return error ;
}
2010-04-02 10:19:10 +04:00
# ifdef CONFIG_L2TP_V3
2017-09-01 18:58:51 +03:00
/* Called when creating sessions via the netlink interface. */
static int pppol2tp_session_create ( struct net * net , struct l2tp_tunnel * tunnel ,
u32 session_id , u32 peer_session_id ,
struct l2tp_session_cfg * cfg )
2010-04-02 10:19:10 +04:00
{
int error ;
struct l2tp_session * session ;
/* Error if tunnel socket is not prepped */
2017-09-01 18:58:51 +03:00
if ( ! tunnel - > sock ) {
error = - ENOENT ;
2017-10-27 17:51:50 +03:00
goto err ;
2017-09-01 18:58:51 +03:00
}
2010-04-02 10:19:10 +04:00
/* Default MTU values. */
if ( cfg - > mtu = = 0 )
cfg - > mtu = 1500 - PPPOL2TP_HEADER_OVERHEAD ;
if ( cfg - > mru = = 0 )
cfg - > mru = cfg - > mtu ;
/* Allocate and initialize a new session context. */
session = l2tp_session_create ( sizeof ( struct pppol2tp_session ) ,
tunnel , session_id ,
peer_session_id , cfg ) ;
2017-03-31 14:02:27 +03:00
if ( IS_ERR ( session ) ) {
error = PTR_ERR ( session ) ;
2017-10-27 17:51:50 +03:00
goto err ;
2017-03-31 14:02:27 +03:00
}
2010-04-02 10:19:10 +04:00
l2tp: initialise PPP sessions before registering them
pppol2tp_connect() initialises L2TP sessions after they've been exposed
to the rest of the system by l2tp_session_register(). This puts
sessions into transient states that are the source of several races, in
particular with session's deletion path.
This patch centralises the initialisation code into
pppol2tp_session_init(), which is called before the registration phase.
The only field that can't be set before session registration is the
pppol2tp socket pointer, which has already been converted to RCU. So
pppol2tp_connect() should now be race-free.
The session's .session_close() callback is now set before registration.
Therefore, it's always called when l2tp_core deletes the session, even
if it was created by pppol2tp_session_create() and hasn't been plugged
to a pppol2tp socket yet. That'd prevent session free because the extra
reference taken by pppol2tp_session_close() wouldn't be dropped by the
socket's ->sk_destruct() callback (pppol2tp_session_destruct()).
We could set .session_close() only while connecting a session to its
pppol2tp socket, or teach pppol2tp_session_close() to avoid grabbing a
reference when the session isn't connected, but that'd require adding
some form of synchronisation to be race free.
Instead of that, we can just let the pppol2tp socket hold a reference
on the session as soon as it starts depending on it (that is, in
pppol2tp_connect()). Then we don't need to utilise
pppol2tp_session_close() to hold a reference at the last moment to
prevent l2tp_core from dropping it.
When releasing the socket, pppol2tp_release() now deletes the session
using the standard l2tp_session_delete() function, instead of merely
removing it from hash tables. l2tp_session_delete() drops the reference
the sessions holds on itself, but also makes sure it doesn't remove a
session twice. So it can safely be called, even if l2tp_core already
tried, or is concurrently trying, to remove the session.
Finally, pppol2tp_session_destruct() drops the reference held by the
socket.
Fixes: fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts")
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
pppol2tp_session_init ( session ) ;
2010-04-02 10:19:10 +04:00
2017-10-27 17:51:50 +03:00
error = l2tp_session_register ( session , tunnel ) ;
if ( error < 0 )
goto err_sess ;
2010-04-02 10:19:10 +04:00
2017-10-27 17:51:50 +03:00
return 0 ;
2010-04-02 10:19:10 +04:00
2017-10-27 17:51:50 +03:00
err_sess :
kfree ( session ) ;
err :
2010-04-02 10:19:10 +04:00
return error ;
}
# endif /* CONFIG_L2TP_V3 */
2010-04-02 10:18:33 +04:00
/* getname() support.
*/
static int pppol2tp_getname ( struct socket * sock , struct sockaddr * uaddr ,
int * usockaddr_len , int peer )
{
2010-04-02 10:18:54 +04:00
int len = 0 ;
2010-04-02 10:18:33 +04:00
int error = 0 ;
struct l2tp_session * session ;
struct l2tp_tunnel * tunnel ;
struct sock * sk = sock - > sk ;
struct inet_sock * inet ;
struct pppol2tp_session * pls ;
error = - ENOTCONN ;
if ( sk = = NULL )
goto end ;
2016-08-19 08:36:23 +03:00
if ( ! ( sk - > sk_state & PPPOX_CONNECTED ) )
2010-04-02 10:18:33 +04:00
goto end ;
error = - EBADF ;
session = pppol2tp_sock_to_session ( sk ) ;
if ( session = = NULL )
goto end ;
pls = l2tp_session_priv ( session ) ;
2017-11-11 00:06:31 +03:00
tunnel = session - > tunnel ;
2010-04-02 10:18:33 +04:00
2012-03-20 07:57:54 +04:00
inet = inet_sk ( tunnel - > sock ) ;
2012-04-27 12:24:18 +04:00
if ( ( tunnel - > version = = 2 ) & & ( tunnel - > sock - > sk_family = = AF_INET ) ) {
2010-04-02 10:18:54 +04:00
struct sockaddr_pppol2tp sp ;
len = sizeof ( sp ) ;
memset ( & sp , 0 , len ) ;
sp . sa_family = AF_PPPOX ;
sp . sa_protocol = PX_PROTO_OL2TP ;
sp . pppol2tp . fd = tunnel - > fd ;
sp . pppol2tp . pid = pls - > owner ;
sp . pppol2tp . s_tunnel = tunnel - > tunnel_id ;
sp . pppol2tp . d_tunnel = tunnel - > peer_tunnel_id ;
sp . pppol2tp . s_session = session - > session_id ;
sp . pppol2tp . d_session = session - > peer_session_id ;
sp . pppol2tp . addr . sin_family = AF_INET ;
sp . pppol2tp . addr . sin_port = inet - > inet_dport ;
sp . pppol2tp . addr . sin_addr . s_addr = inet - > inet_daddr ;
memcpy ( uaddr , & sp , len ) ;
2012-04-27 12:24:18 +04:00
# if IS_ENABLED(CONFIG_IPV6)
} else if ( ( tunnel - > version = = 2 ) & &
( tunnel - > sock - > sk_family = = AF_INET6 ) ) {
struct sockaddr_pppol2tpin6 sp ;
ipv6: make lookups simpler and faster
TCP listener refactoring, part 4 :
To speed up inet lookups, we moved IPv4 addresses from inet to struct
sock_common
Now is time to do the same for IPv6, because it permits us to have fast
lookups for all kind of sockets, including upcoming SYN_RECV.
Getting IPv6 addresses in TCP lookups currently requires two extra cache
lines, plus a dereference (and memory stall).
inet6_sk(sk) does the dereference of inet_sk(__sk)->pinet6
This patch is way bigger than its IPv4 counter part, because for IPv4,
we could add aliases (inet_daddr, inet_rcv_saddr), while on IPv6,
it's not doable easily.
inet6_sk(sk)->daddr becomes sk->sk_v6_daddr
inet6_sk(sk)->rcv_saddr becomes sk->sk_v6_rcv_saddr
And timewait socket also have tw->tw_v6_daddr & tw->tw_v6_rcv_saddr
at the same offset.
We get rid of INET6_TW_MATCH() as INET6_MATCH() is now the generic
macro.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-04 02:42:29 +04:00
2012-04-27 12:24:18 +04:00
len = sizeof ( sp ) ;
memset ( & sp , 0 , len ) ;
sp . sa_family = AF_PPPOX ;
sp . sa_protocol = PX_PROTO_OL2TP ;
sp . pppol2tp . fd = tunnel - > fd ;
sp . pppol2tp . pid = pls - > owner ;
sp . pppol2tp . s_tunnel = tunnel - > tunnel_id ;
sp . pppol2tp . d_tunnel = tunnel - > peer_tunnel_id ;
sp . pppol2tp . s_session = session - > session_id ;
sp . pppol2tp . d_session = session - > peer_session_id ;
sp . pppol2tp . addr . sin6_family = AF_INET6 ;
sp . pppol2tp . addr . sin6_port = inet - > inet_dport ;
ipv6: make lookups simpler and faster
TCP listener refactoring, part 4 :
To speed up inet lookups, we moved IPv4 addresses from inet to struct
sock_common
Now is time to do the same for IPv6, because it permits us to have fast
lookups for all kind of sockets, including upcoming SYN_RECV.
Getting IPv6 addresses in TCP lookups currently requires two extra cache
lines, plus a dereference (and memory stall).
inet6_sk(sk) does the dereference of inet_sk(__sk)->pinet6
This patch is way bigger than its IPv4 counter part, because for IPv4,
we could add aliases (inet_daddr, inet_rcv_saddr), while on IPv6,
it's not doable easily.
inet6_sk(sk)->daddr becomes sk->sk_v6_daddr
inet6_sk(sk)->rcv_saddr becomes sk->sk_v6_rcv_saddr
And timewait socket also have tw->tw_v6_daddr & tw->tw_v6_rcv_saddr
at the same offset.
We get rid of INET6_TW_MATCH() as INET6_MATCH() is now the generic
macro.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-04 02:42:29 +04:00
memcpy ( & sp . pppol2tp . addr . sin6_addr , & tunnel - > sock - > sk_v6_daddr ,
sizeof ( tunnel - > sock - > sk_v6_daddr ) ) ;
2012-04-27 12:24:18 +04:00
memcpy ( uaddr , & sp , len ) ;
} else if ( ( tunnel - > version = = 3 ) & &
( tunnel - > sock - > sk_family = = AF_INET6 ) ) {
struct sockaddr_pppol2tpv3in6 sp ;
ipv6: make lookups simpler and faster
TCP listener refactoring, part 4 :
To speed up inet lookups, we moved IPv4 addresses from inet to struct
sock_common
Now is time to do the same for IPv6, because it permits us to have fast
lookups for all kind of sockets, including upcoming SYN_RECV.
Getting IPv6 addresses in TCP lookups currently requires two extra cache
lines, plus a dereference (and memory stall).
inet6_sk(sk) does the dereference of inet_sk(__sk)->pinet6
This patch is way bigger than its IPv4 counter part, because for IPv4,
we could add aliases (inet_daddr, inet_rcv_saddr), while on IPv6,
it's not doable easily.
inet6_sk(sk)->daddr becomes sk->sk_v6_daddr
inet6_sk(sk)->rcv_saddr becomes sk->sk_v6_rcv_saddr
And timewait socket also have tw->tw_v6_daddr & tw->tw_v6_rcv_saddr
at the same offset.
We get rid of INET6_TW_MATCH() as INET6_MATCH() is now the generic
macro.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-04 02:42:29 +04:00
2012-04-27 12:24:18 +04:00
len = sizeof ( sp ) ;
memset ( & sp , 0 , len ) ;
sp . sa_family = AF_PPPOX ;
sp . sa_protocol = PX_PROTO_OL2TP ;
sp . pppol2tp . fd = tunnel - > fd ;
sp . pppol2tp . pid = pls - > owner ;
sp . pppol2tp . s_tunnel = tunnel - > tunnel_id ;
sp . pppol2tp . d_tunnel = tunnel - > peer_tunnel_id ;
sp . pppol2tp . s_session = session - > session_id ;
sp . pppol2tp . d_session = session - > peer_session_id ;
sp . pppol2tp . addr . sin6_family = AF_INET6 ;
sp . pppol2tp . addr . sin6_port = inet - > inet_dport ;
ipv6: make lookups simpler and faster
TCP listener refactoring, part 4 :
To speed up inet lookups, we moved IPv4 addresses from inet to struct
sock_common
Now is time to do the same for IPv6, because it permits us to have fast
lookups for all kind of sockets, including upcoming SYN_RECV.
Getting IPv6 addresses in TCP lookups currently requires two extra cache
lines, plus a dereference (and memory stall).
inet6_sk(sk) does the dereference of inet_sk(__sk)->pinet6
This patch is way bigger than its IPv4 counter part, because for IPv4,
we could add aliases (inet_daddr, inet_rcv_saddr), while on IPv6,
it's not doable easily.
inet6_sk(sk)->daddr becomes sk->sk_v6_daddr
inet6_sk(sk)->rcv_saddr becomes sk->sk_v6_rcv_saddr
And timewait socket also have tw->tw_v6_daddr & tw->tw_v6_rcv_saddr
at the same offset.
We get rid of INET6_TW_MATCH() as INET6_MATCH() is now the generic
macro.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-04 02:42:29 +04:00
memcpy ( & sp . pppol2tp . addr . sin6_addr , & tunnel - > sock - > sk_v6_daddr ,
sizeof ( tunnel - > sock - > sk_v6_daddr ) ) ;
2012-04-27 12:24:18 +04:00
memcpy ( uaddr , & sp , len ) ;
# endif
2010-04-02 10:18:54 +04:00
} else if ( tunnel - > version = = 3 ) {
struct sockaddr_pppol2tpv3 sp ;
len = sizeof ( sp ) ;
memset ( & sp , 0 , len ) ;
sp . sa_family = AF_PPPOX ;
sp . sa_protocol = PX_PROTO_OL2TP ;
sp . pppol2tp . fd = tunnel - > fd ;
sp . pppol2tp . pid = pls - > owner ;
sp . pppol2tp . s_tunnel = tunnel - > tunnel_id ;
sp . pppol2tp . d_tunnel = tunnel - > peer_tunnel_id ;
sp . pppol2tp . s_session = session - > session_id ;
sp . pppol2tp . d_session = session - > peer_session_id ;
sp . pppol2tp . addr . sin_family = AF_INET ;
sp . pppol2tp . addr . sin_port = inet - > inet_dport ;
sp . pppol2tp . addr . sin_addr . s_addr = inet - > inet_daddr ;
memcpy ( uaddr , & sp , len ) ;
}
2010-04-02 10:18:33 +04:00
* usockaddr_len = len ;
2016-07-26 22:14:35 +03:00
error = 0 ;
2010-04-02 10:18:33 +04:00
sock_put ( sk ) ;
end :
return error ;
}
/****************************************************************************
* ioctl ( ) handlers .
*
* The PPPoX socket is created for L2TP sessions : tunnels have their own UDP
* sockets . However , in order to control kernel tunnel features , we allow
* userspace to create a special " tunnel " PPPoX socket which is used for
* control only . Tunnel PPPoX sockets have session_id = = 0 and simply allow
* the user application to issue L2TP setsockopt ( ) , getsockopt ( ) and ioctl ( )
* calls .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
static void pppol2tp_copy_stats ( struct pppol2tp_ioc_stats * dest ,
struct l2tp_stats * stats )
{
2013-03-19 10:11:22 +04:00
dest - > tx_packets = atomic_long_read ( & stats - > tx_packets ) ;
dest - > tx_bytes = atomic_long_read ( & stats - > tx_bytes ) ;
dest - > tx_errors = atomic_long_read ( & stats - > tx_errors ) ;
dest - > rx_packets = atomic_long_read ( & stats - > rx_packets ) ;
dest - > rx_bytes = atomic_long_read ( & stats - > rx_bytes ) ;
dest - > rx_seq_discards = atomic_long_read ( & stats - > rx_seq_discards ) ;
dest - > rx_oos_packets = atomic_long_read ( & stats - > rx_oos_packets ) ;
dest - > rx_errors = atomic_long_read ( & stats - > rx_errors ) ;
2010-04-02 10:18:33 +04:00
}
/* Session ioctl helper.
*/
static int pppol2tp_session_ioctl ( struct l2tp_session * session ,
unsigned int cmd , unsigned long arg )
{
struct ifreq ifr ;
int err = 0 ;
struct sock * sk ;
int val = ( int ) arg ;
struct pppol2tp_session * ps = l2tp_session_priv ( session ) ;
struct l2tp_tunnel * tunnel = session - > tunnel ;
struct pppol2tp_ioc_stats stats ;
2016-12-11 03:18:59 +03:00
l2tp_dbg ( session , L2TP_MSG_CONTROL ,
2012-05-16 13:55:56 +04:00
" %s: pppol2tp_session_ioctl(cmd=%#x, arg=%#lx) \n " ,
session - > name , cmd , arg ) ;
2010-04-02 10:18:33 +04:00
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
sk = pppol2tp_session_get_sock ( session ) ;
2017-10-13 20:22:35 +03:00
if ( ! sk )
return - EBADR ;
2010-04-02 10:18:33 +04:00
switch ( cmd ) {
case SIOCGIFMTU :
err = - ENXIO ;
if ( ! ( sk - > sk_state & PPPOX_CONNECTED ) )
break ;
err = - EFAULT ;
if ( copy_from_user ( & ifr , ( void __user * ) arg , sizeof ( struct ifreq ) ) )
break ;
ifr . ifr_mtu = session - > mtu ;
if ( copy_to_user ( ( void __user * ) arg , & ifr , sizeof ( struct ifreq ) ) )
break ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL , " %s: get mtu=%d \n " ,
2012-05-16 13:55:56 +04:00
session - > name , session - > mtu ) ;
2010-04-02 10:18:33 +04:00
err = 0 ;
break ;
case SIOCSIFMTU :
err = - ENXIO ;
if ( ! ( sk - > sk_state & PPPOX_CONNECTED ) )
break ;
err = - EFAULT ;
if ( copy_from_user ( & ifr , ( void __user * ) arg , sizeof ( struct ifreq ) ) )
break ;
session - > mtu = ifr . ifr_mtu ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL , " %s: set mtu=%d \n " ,
2012-05-16 13:55:56 +04:00
session - > name , session - > mtu ) ;
2010-04-02 10:18:33 +04:00
err = 0 ;
break ;
case PPPIOCGMRU :
err = - ENXIO ;
if ( ! ( sk - > sk_state & PPPOX_CONNECTED ) )
break ;
err = - EFAULT ;
if ( put_user ( session - > mru , ( int __user * ) arg ) )
break ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL , " %s: get mru=%d \n " ,
2012-05-16 13:55:56 +04:00
session - > name , session - > mru ) ;
2010-04-02 10:18:33 +04:00
err = 0 ;
break ;
case PPPIOCSMRU :
err = - ENXIO ;
if ( ! ( sk - > sk_state & PPPOX_CONNECTED ) )
break ;
err = - EFAULT ;
if ( get_user ( val , ( int __user * ) arg ) )
break ;
session - > mru = val ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL , " %s: set mru=%d \n " ,
2012-05-16 13:55:56 +04:00
session - > name , session - > mru ) ;
2010-04-02 10:18:33 +04:00
err = 0 ;
break ;
case PPPIOCGFLAGS :
err = - EFAULT ;
if ( put_user ( ps - > flags , ( int __user * ) arg ) )
break ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL , " %s: get flags=%d \n " ,
2012-05-16 13:55:56 +04:00
session - > name , ps - > flags ) ;
2010-04-02 10:18:33 +04:00
err = 0 ;
break ;
case PPPIOCSFLAGS :
err = - EFAULT ;
if ( get_user ( val , ( int __user * ) arg ) )
break ;
ps - > flags = val ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL , " %s: set flags=%d \n " ,
2012-05-16 13:55:56 +04:00
session - > name , ps - > flags ) ;
2010-04-02 10:18:33 +04:00
err = 0 ;
break ;
case PPPIOCGL2TPSTATS :
err = - ENXIO ;
if ( ! ( sk - > sk_state & PPPOX_CONNECTED ) )
break ;
memset ( & stats , 0 , sizeof ( stats ) ) ;
stats . tunnel_id = tunnel - > tunnel_id ;
stats . session_id = session - > session_id ;
pppol2tp_copy_stats ( & stats , & session - > stats ) ;
if ( copy_to_user ( ( void __user * ) arg , & stats ,
sizeof ( stats ) ) )
break ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL , " %s: get L2TP stats \n " ,
2012-05-16 13:55:56 +04:00
session - > name ) ;
2010-04-02 10:18:33 +04:00
err = 0 ;
break ;
default :
err = - ENOSYS ;
break ;
}
sock_put ( sk ) ;
return err ;
}
/* Tunnel ioctl helper.
*
* Note the special handling for PPPIOCGL2TPSTATS below . If the ioctl data
* specifies a session_id , the session ioctl handler is called . This allows an
* application to retrieve session stats via a tunnel socket .
*/
static int pppol2tp_tunnel_ioctl ( struct l2tp_tunnel * tunnel ,
unsigned int cmd , unsigned long arg )
{
int err = 0 ;
struct sock * sk ;
struct pppol2tp_ioc_stats stats ;
2016-12-11 03:18:59 +03:00
l2tp_dbg ( tunnel , L2TP_MSG_CONTROL ,
2012-05-16 13:55:56 +04:00
" %s: pppol2tp_tunnel_ioctl(cmd=%#x, arg=%#lx) \n " ,
tunnel - > name , cmd , arg ) ;
2010-04-02 10:18:33 +04:00
sk = tunnel - > sock ;
sock_hold ( sk ) ;
switch ( cmd ) {
case PPPIOCGL2TPSTATS :
err = - ENXIO ;
if ( ! ( sk - > sk_state & PPPOX_CONNECTED ) )
break ;
if ( copy_from_user ( & stats , ( void __user * ) arg ,
sizeof ( stats ) ) ) {
err = - EFAULT ;
break ;
}
if ( stats . session_id ! = 0 ) {
/* resend to session ioctl handler */
struct l2tp_session * session =
2017-03-31 14:02:26 +03:00
l2tp_session_get ( sock_net ( sk ) , tunnel ,
2017-10-31 19:36:42 +03:00
stats . session_id ) ;
2017-03-31 14:02:26 +03:00
if ( session ) {
err = pppol2tp_session_ioctl ( session , cmd ,
arg ) ;
l2tp_session_dec_refcount ( session ) ;
} else {
2010-04-02 10:18:33 +04:00
err = - EBADR ;
2017-03-31 14:02:26 +03:00
}
2010-04-02 10:18:33 +04:00
break ;
}
# ifdef CONFIG_XFRM
stats . using_ipsec = ( sk - > sk_policy [ 0 ] | | sk - > sk_policy [ 1 ] ) ? 1 : 0 ;
# endif
pppol2tp_copy_stats ( & stats , & tunnel - > stats ) ;
if ( copy_to_user ( ( void __user * ) arg , & stats , sizeof ( stats ) ) ) {
err = - EFAULT ;
break ;
}
2016-12-11 03:18:59 +03:00
l2tp_info ( tunnel , L2TP_MSG_CONTROL , " %s: get L2TP stats \n " ,
2012-05-16 13:55:56 +04:00
tunnel - > name ) ;
2010-04-02 10:18:33 +04:00
err = 0 ;
break ;
default :
err = - ENOSYS ;
break ;
}
sock_put ( sk ) ;
return err ;
}
/* Main ioctl() handler.
* Dispatch to tunnel or session helpers depending on the socket .
*/
static int pppol2tp_ioctl ( struct socket * sock , unsigned int cmd ,
unsigned long arg )
{
struct sock * sk = sock - > sk ;
struct l2tp_session * session ;
struct l2tp_tunnel * tunnel ;
int err ;
if ( ! sk )
return 0 ;
err = - EBADF ;
if ( sock_flag ( sk , SOCK_DEAD ) ! = 0 )
goto end ;
err = - ENOTCONN ;
if ( ( sk - > sk_user_data = = NULL ) | |
( ! ( sk - > sk_state & ( PPPOX_CONNECTED | PPPOX_BOUND ) ) ) )
goto end ;
/* Get session context from the socket */
err = - EBADF ;
session = pppol2tp_sock_to_session ( sk ) ;
if ( session = = NULL )
goto end ;
/* Special case: if session's session_id is zero, treat ioctl as a
* tunnel ioctl
*/
if ( ( session - > session_id = = 0 ) & &
( session - > peer_session_id = = 0 ) ) {
2017-11-11 00:06:31 +03:00
tunnel = session - > tunnel ;
2010-04-02 10:18:33 +04:00
err = pppol2tp_tunnel_ioctl ( tunnel , cmd , arg ) ;
goto end_put_sess ;
}
err = pppol2tp_session_ioctl ( session , cmd , arg ) ;
end_put_sess :
sock_put ( sk ) ;
end :
return err ;
}
/*****************************************************************************
* setsockopt ( ) / getsockopt ( ) support .
*
* The PPPoX socket is created for L2TP sessions : tunnels have their own UDP
* sockets . In order to control kernel tunnel features , we allow userspace to
* create a special " tunnel " PPPoX socket which is used for control only .
* Tunnel PPPoX sockets have session_id = = 0 and simply allow the user
* application to issue L2TP setsockopt ( ) , getsockopt ( ) and ioctl ( ) calls .
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* Tunnel setsockopt() helper.
*/
static int pppol2tp_tunnel_setsockopt ( struct sock * sk ,
struct l2tp_tunnel * tunnel ,
int optname , int val )
{
int err = 0 ;
switch ( optname ) {
case PPPOL2TP_SO_DEBUG :
tunnel - > debug = val ;
2016-12-11 03:18:59 +03:00
l2tp_info ( tunnel , L2TP_MSG_CONTROL , " %s: set debug=%x \n " ,
2012-05-16 13:55:56 +04:00
tunnel - > name , tunnel - > debug ) ;
2010-04-02 10:18:33 +04:00
break ;
default :
err = - ENOPROTOOPT ;
break ;
}
return err ;
}
/* Session setsockopt helper.
*/
static int pppol2tp_session_setsockopt ( struct sock * sk ,
struct l2tp_session * session ,
int optname , int val )
{
int err = 0 ;
switch ( optname ) {
case PPPOL2TP_SO_RECVSEQ :
if ( ( val ! = 0 ) & & ( val ! = 1 ) ) {
err = - EINVAL ;
break ;
}
2016-11-07 23:39:28 +03:00
session - > recv_seq = ! ! val ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL ,
2012-05-16 13:55:56 +04:00
" %s: set recv_seq=%d \n " ,
session - > name , session - > recv_seq ) ;
2010-04-02 10:18:33 +04:00
break ;
case PPPOL2TP_SO_SENDSEQ :
if ( ( val ! = 0 ) & & ( val ! = 1 ) ) {
err = - EINVAL ;
break ;
}
2016-11-07 23:39:28 +03:00
session - > send_seq = ! ! val ;
2010-04-02 10:18:33 +04:00
{
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
struct pppox_sock * po = pppox_sk ( sk ) ;
2010-04-02 10:18:33 +04:00
po - > chan . hdrlen = val ? PPPOL2TP_L2TP_HDR_SIZE_SEQ :
PPPOL2TP_L2TP_HDR_SIZE_NOSEQ ;
}
2014-03-06 14:14:30 +04:00
l2tp_session_set_header_len ( session , session - > tunnel - > version ) ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL ,
2012-05-16 13:55:56 +04:00
" %s: set send_seq=%d \n " ,
session - > name , session - > send_seq ) ;
2010-04-02 10:18:33 +04:00
break ;
case PPPOL2TP_SO_LNSMODE :
if ( ( val ! = 0 ) & & ( val ! = 1 ) ) {
err = - EINVAL ;
break ;
}
2016-11-07 23:39:28 +03:00
session - > lns_mode = ! ! val ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL ,
2012-05-16 13:55:56 +04:00
" %s: set lns_mode=%d \n " ,
session - > name , session - > lns_mode ) ;
2010-04-02 10:18:33 +04:00
break ;
case PPPOL2TP_SO_DEBUG :
session - > debug = val ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL , " %s: set debug=%x \n " ,
2012-05-16 13:55:56 +04:00
session - > name , session - > debug ) ;
2010-04-02 10:18:33 +04:00
break ;
case PPPOL2TP_SO_REORDERTO :
session - > reorder_timeout = msecs_to_jiffies ( val ) ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL ,
2012-05-16 13:55:56 +04:00
" %s: set reorder_timeout=%d \n " ,
session - > name , session - > reorder_timeout ) ;
2010-04-02 10:18:33 +04:00
break ;
default :
err = - ENOPROTOOPT ;
break ;
}
return err ;
}
/* Main setsockopt() entry point.
* Does API checks , then calls either the tunnel or session setsockopt
* handler , according to whether the PPPoL2TP socket is a for a regular
* session or the special tunnel type .
*/
static int pppol2tp_setsockopt ( struct socket * sock , int level , int optname ,
char __user * optval , unsigned int optlen )
{
struct sock * sk = sock - > sk ;
struct l2tp_session * session ;
struct l2tp_tunnel * tunnel ;
int val ;
int err ;
if ( level ! = SOL_PPPOL2TP )
2014-07-15 04:02:31 +04:00
return - EINVAL ;
2010-04-02 10:18:33 +04:00
if ( optlen < sizeof ( int ) )
return - EINVAL ;
if ( get_user ( val , ( int __user * ) optval ) )
return - EFAULT ;
err = - ENOTCONN ;
if ( sk - > sk_user_data = = NULL )
goto end ;
/* Get session context from the socket */
err = - EBADF ;
session = pppol2tp_sock_to_session ( sk ) ;
if ( session = = NULL )
goto end ;
/* Special case: if session_id == 0x0000, treat as operation on tunnel
*/
if ( ( session - > session_id = = 0 ) & &
( session - > peer_session_id = = 0 ) ) {
2017-11-11 00:06:31 +03:00
tunnel = session - > tunnel ;
2010-04-02 10:18:33 +04:00
err = pppol2tp_tunnel_setsockopt ( sk , tunnel , optname , val ) ;
2017-11-11 00:06:31 +03:00
} else {
2010-04-02 10:18:33 +04:00
err = pppol2tp_session_setsockopt ( sk , session , optname , val ) ;
2017-11-11 00:06:31 +03:00
}
2010-04-02 10:18:33 +04:00
sock_put ( sk ) ;
end :
return err ;
}
/* Tunnel getsockopt helper. Called with sock locked.
*/
static int pppol2tp_tunnel_getsockopt ( struct sock * sk ,
struct l2tp_tunnel * tunnel ,
int optname , int * val )
{
int err = 0 ;
switch ( optname ) {
case PPPOL2TP_SO_DEBUG :
* val = tunnel - > debug ;
2016-12-11 03:18:59 +03:00
l2tp_info ( tunnel , L2TP_MSG_CONTROL , " %s: get debug=%x \n " ,
2012-05-16 13:55:56 +04:00
tunnel - > name , tunnel - > debug ) ;
2010-04-02 10:18:33 +04:00
break ;
default :
err = - ENOPROTOOPT ;
break ;
}
return err ;
}
/* Session getsockopt helper. Called with sock locked.
*/
static int pppol2tp_session_getsockopt ( struct sock * sk ,
struct l2tp_session * session ,
int optname , int * val )
{
int err = 0 ;
switch ( optname ) {
case PPPOL2TP_SO_RECVSEQ :
* val = session - > recv_seq ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL ,
2012-05-16 13:55:56 +04:00
" %s: get recv_seq=%d \n " , session - > name , * val ) ;
2010-04-02 10:18:33 +04:00
break ;
case PPPOL2TP_SO_SENDSEQ :
* val = session - > send_seq ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL ,
2012-05-16 13:55:56 +04:00
" %s: get send_seq=%d \n " , session - > name , * val ) ;
2010-04-02 10:18:33 +04:00
break ;
case PPPOL2TP_SO_LNSMODE :
* val = session - > lns_mode ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL ,
2012-05-16 13:55:56 +04:00
" %s: get lns_mode=%d \n " , session - > name , * val ) ;
2010-04-02 10:18:33 +04:00
break ;
case PPPOL2TP_SO_DEBUG :
* val = session - > debug ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL , " %s: get debug=%d \n " ,
2012-05-16 13:55:56 +04:00
session - > name , * val ) ;
2010-04-02 10:18:33 +04:00
break ;
case PPPOL2TP_SO_REORDERTO :
* val = ( int ) jiffies_to_msecs ( session - > reorder_timeout ) ;
2016-12-11 03:18:59 +03:00
l2tp_info ( session , L2TP_MSG_CONTROL ,
2012-05-16 13:55:56 +04:00
" %s: get reorder_timeout=%d \n " , session - > name , * val ) ;
2010-04-02 10:18:33 +04:00
break ;
default :
err = - ENOPROTOOPT ;
}
return err ;
}
/* Main getsockopt() entry point.
* Does API checks , then calls either the tunnel or session getsockopt
* handler , according to whether the PPPoX socket is a for a regular session
* or the special tunnel type .
*/
2012-06-03 21:41:40 +04:00
static int pppol2tp_getsockopt ( struct socket * sock , int level , int optname ,
char __user * optval , int __user * optlen )
2010-04-02 10:18:33 +04:00
{
struct sock * sk = sock - > sk ;
struct l2tp_session * session ;
struct l2tp_tunnel * tunnel ;
int val , len ;
int err ;
if ( level ! = SOL_PPPOL2TP )
2014-07-15 04:02:31 +04:00
return - EINVAL ;
2010-04-02 10:18:33 +04:00
2012-06-03 21:41:40 +04:00
if ( get_user ( len , optlen ) )
2010-04-02 10:18:33 +04:00
return - EFAULT ;
len = min_t ( unsigned int , len , sizeof ( int ) ) ;
if ( len < 0 )
return - EINVAL ;
err = - ENOTCONN ;
if ( sk - > sk_user_data = = NULL )
goto end ;
/* Get the session context */
err = - EBADF ;
session = pppol2tp_sock_to_session ( sk ) ;
if ( session = = NULL )
goto end ;
/* Special case: if session_id == 0x0000, treat as operation on tunnel */
if ( ( session - > session_id = = 0 ) & &
( session - > peer_session_id = = 0 ) ) {
2017-11-11 00:06:31 +03:00
tunnel = session - > tunnel ;
2010-04-02 10:18:33 +04:00
err = pppol2tp_tunnel_getsockopt ( sk , tunnel , optname , & val ) ;
2017-04-06 19:31:21 +03:00
if ( err )
goto end_put_sess ;
} else {
2010-04-02 10:18:33 +04:00
err = pppol2tp_session_getsockopt ( sk , session , optname , & val ) ;
2017-04-06 19:31:21 +03:00
if ( err )
goto end_put_sess ;
}
2010-04-02 10:18:33 +04:00
err = - EFAULT ;
2012-06-03 21:41:40 +04:00
if ( put_user ( len , optlen ) )
2010-04-02 10:18:33 +04:00
goto end_put_sess ;
if ( copy_to_user ( ( void __user * ) optval , & val , len ) )
goto end_put_sess ;
err = 0 ;
end_put_sess :
sock_put ( sk ) ;
end :
return err ;
}
/*****************************************************************************
* / proc filesystem for debug
2010-04-02 10:18:49 +04:00
* Since the original pppol2tp driver provided / proc / net / pppol2tp for
* L2TPv2 , we dump only L2TPv2 tunnels and sessions here .
2010-04-02 10:18:33 +04:00
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
static unsigned int pppol2tp_net_id ;
# ifdef CONFIG_PROC_FS
struct pppol2tp_seq_data {
struct seq_net_private p ;
int tunnel_idx ; /* current tunnel */
int session_idx ; /* index of session within current tunnel */
struct l2tp_tunnel * tunnel ;
struct l2tp_session * session ; /* NULL means get next tunnel */
} ;
static void pppol2tp_next_tunnel ( struct net * net , struct pppol2tp_seq_data * pd )
{
2010-04-02 10:18:49 +04:00
for ( ; ; ) {
pd - > tunnel = l2tp_tunnel_find_nth ( net , pd - > tunnel_idx ) ;
pd - > tunnel_idx + + ;
if ( pd - > tunnel = = NULL )
break ;
/* Ignore L2TPv3 tunnels */
if ( pd - > tunnel - > version < 3 )
break ;
}
2010-04-02 10:18:33 +04:00
}
static void pppol2tp_next_session ( struct net * net , struct pppol2tp_seq_data * pd )
{
2017-10-31 19:36:42 +03:00
pd - > session = l2tp_session_get_nth ( pd - > tunnel , pd - > session_idx ) ;
2010-04-02 10:18:33 +04:00
pd - > session_idx + + ;
2010-04-02 10:18:49 +04:00
2010-04-02 10:18:33 +04:00
if ( pd - > session = = NULL ) {
pd - > session_idx = 0 ;
pppol2tp_next_tunnel ( net , pd ) ;
}
}
static void * pppol2tp_seq_start ( struct seq_file * m , loff_t * offs )
{
struct pppol2tp_seq_data * pd = SEQ_START_TOKEN ;
loff_t pos = * offs ;
struct net * net ;
if ( ! pos )
goto out ;
BUG_ON ( m - > private = = NULL ) ;
pd = m - > private ;
net = seq_file_net ( m ) ;
if ( pd - > tunnel = = NULL )
pppol2tp_next_tunnel ( net , pd ) ;
else
pppol2tp_next_session ( net , pd ) ;
/* NULL tunnel and session indicates end of list */
if ( ( pd - > tunnel = = NULL ) & & ( pd - > session = = NULL ) )
pd = NULL ;
out :
return pd ;
}
static void * pppol2tp_seq_next ( struct seq_file * m , void * v , loff_t * pos )
{
( * pos ) + + ;
return NULL ;
}
static void pppol2tp_seq_stop ( struct seq_file * p , void * v )
{
/* nothing to do */
}
static void pppol2tp_seq_tunnel_show ( struct seq_file * m , void * v )
{
struct l2tp_tunnel * tunnel = v ;
seq_printf ( m , " \n TUNNEL '%s', %c %d \n " ,
tunnel - > name ,
( tunnel = = tunnel - > sock - > sk_user_data ) ? ' Y ' : ' N ' ,
2017-07-04 15:52:57 +03:00
refcount_read ( & tunnel - > ref_count ) - 1 ) ;
2013-03-19 10:11:22 +04:00
seq_printf ( m , " %08x %ld/%ld/%ld %ld/%ld/%ld \n " ,
2010-04-02 10:18:33 +04:00
tunnel - > debug ,
2013-03-19 10:11:22 +04:00
atomic_long_read ( & tunnel - > stats . tx_packets ) ,
atomic_long_read ( & tunnel - > stats . tx_bytes ) ,
atomic_long_read ( & tunnel - > stats . tx_errors ) ,
atomic_long_read ( & tunnel - > stats . rx_packets ) ,
atomic_long_read ( & tunnel - > stats . rx_bytes ) ,
atomic_long_read ( & tunnel - > stats . rx_errors ) ) ;
2010-04-02 10:18:33 +04:00
}
static void pppol2tp_seq_session_show ( struct seq_file * m , void * v )
{
struct l2tp_session * session = v ;
struct l2tp_tunnel * tunnel = session - > tunnel ;
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
unsigned char state ;
char user_data_ok ;
struct sock * sk ;
2010-04-02 10:18:33 +04:00
u32 ip = 0 ;
u16 port = 0 ;
if ( tunnel - > sock ) {
struct inet_sock * inet = inet_sk ( tunnel - > sock ) ;
ip = ntohl ( inet - > inet_saddr ) ;
port = ntohs ( inet - > inet_sport ) ;
}
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
sk = pppol2tp_session_get_sock ( session ) ;
if ( sk ) {
state = sk - > sk_state ;
user_data_ok = ( session = = sk - > sk_user_data ) ? ' Y ' : ' N ' ;
} else {
state = 0 ;
user_data_ok = ' N ' ;
}
2010-04-02 10:18:33 +04:00
seq_printf ( m , " SESSION '%s' %08X/%d %04X/%04X -> "
" %04X/%04X %d %c \n " ,
session - > name , ip , port ,
tunnel - > tunnel_id ,
session - > session_id ,
tunnel - > peer_tunnel_id ,
session - > peer_session_id ,
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
state , user_data_ok ) ;
2010-04-02 10:18:33 +04:00
seq_printf ( m , " %d/%d/%c/%c/%s %08x %u \n " ,
session - > mtu , session - > mru ,
session - > recv_seq ? ' R ' : ' - ' ,
session - > send_seq ? ' S ' : ' - ' ,
session - > lns_mode ? " LNS " : " LAC " ,
session - > debug ,
jiffies_to_msecs ( session - > reorder_timeout ) ) ;
2013-03-19 10:11:22 +04:00
seq_printf ( m , " %hu/%hu %ld/%ld/%ld %ld/%ld/%ld \n " ,
2010-04-02 10:18:33 +04:00
session - > nr , session - > ns ,
2013-03-19 10:11:22 +04:00
atomic_long_read ( & session - > stats . tx_packets ) ,
atomic_long_read ( & session - > stats . tx_bytes ) ,
atomic_long_read ( & session - > stats . tx_errors ) ,
atomic_long_read ( & session - > stats . rx_packets ) ,
atomic_long_read ( & session - > stats . rx_bytes ) ,
atomic_long_read ( & session - > stats . rx_errors ) ) ;
2010-04-02 10:18:44 +04:00
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
if ( sk ) {
struct pppox_sock * po = pppox_sk ( sk ) ;
2010-04-02 10:18:44 +04:00
seq_printf ( m , " interface %s \n " , ppp_dev_name ( & po - > chan ) ) ;
l2tp: protect sock pointer of struct pppol2tp_session with RCU
pppol2tp_session_create() registers sessions that can't have their
corresponding socket initialised. This socket has to be created by
userspace, then connected to the session by pppol2tp_connect().
Therefore, we need to protect the pppol2tp socket pointer of L2TP
sessions, so that it can safely be updated when userspace is connecting
or closing the socket. This will eventually allow pppol2tp_connect()
to avoid generating transient states while initialising its parts of the
session.
To this end, this patch protects the pppol2tp socket pointer using RCU.
The pppol2tp socket pointer is still set in pppol2tp_connect(), but
only once we know the function isn't going to fail. It's eventually
reset by pppol2tp_release(), which now has to wait for a grace period
to elapse before it can drop the last reference on the socket. This
ensures that pppol2tp_session_get_sock() can safely grab a reference
on the socket, even after ps->sk is reset to NULL but before this
operation actually gets visible from pppol2tp_session_get_sock().
The rest is standard RCU conversion: pppol2tp_recv(), which already
runs in atomic context, is simply enclosed by rcu_read_lock() and
rcu_read_unlock(), while other functions are converted to use
pppol2tp_session_get_sock() followed by sock_put().
pppol2tp_session_setsockopt() is a special case. It used to retrieve
the pppol2tp socket from the L2TP session, which itself was retrieved
from the pppol2tp socket. Therefore we can just avoid dereferencing
ps->sk and directly use the original socket pointer instead.
With all users of ps->sk now handling NULL and concurrent updates, the
L2TP ->ref() and ->deref() callbacks aren't needed anymore. Therefore,
rather than converting pppol2tp_session_sock_hold() and
pppol2tp_session_sock_put(), we can just drop them.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-27 17:51:52 +03:00
sock_put ( sk ) ;
}
2010-04-02 10:18:33 +04:00
}
static int pppol2tp_seq_show ( struct seq_file * m , void * v )
{
struct pppol2tp_seq_data * pd = v ;
/* display header on line 1 */
if ( v = = SEQ_START_TOKEN ) {
seq_puts ( m , " PPPoL2TP driver info, " PPPOL2TP_DRV_VERSION " \n " ) ;
seq_puts ( m , " TUNNEL name, user-data-ok session-count \n " ) ;
seq_puts ( m , " debug tx-pkts/bytes/errs rx-pkts/bytes/errs \n " ) ;
seq_puts ( m , " SESSION name, addr/port src-tid/sid "
" dest-tid/sid state user-data-ok \n " ) ;
seq_puts ( m , " mtu/mru/rcvseq/sendseq/lns debug reorderto \n " ) ;
seq_puts ( m , " nr/ns tx-pkts/bytes/errs rx-pkts/bytes/errs \n " ) ;
goto out ;
}
/* Show the tunnel or session context.
*/
2017-04-03 13:03:13 +03:00
if ( ! pd - > session ) {
2010-04-02 10:18:33 +04:00
pppol2tp_seq_tunnel_show ( m , pd - > tunnel ) ;
2017-04-03 13:03:13 +03:00
} else {
2010-04-02 10:18:33 +04:00
pppol2tp_seq_session_show ( m , pd - > session ) ;
2017-04-03 13:03:13 +03:00
l2tp_session_dec_refcount ( pd - > session ) ;
}
2010-04-02 10:18:33 +04:00
out :
return 0 ;
}
static const struct seq_operations pppol2tp_seq_ops = {
. start = pppol2tp_seq_start ,
. next = pppol2tp_seq_next ,
. stop = pppol2tp_seq_stop ,
. show = pppol2tp_seq_show ,
} ;
/* Called when our /proc file is opened. We allocate data for use when
* iterating our tunnel / session contexts and store it in the private
* data of the seq_file .
*/
static int pppol2tp_proc_open ( struct inode * inode , struct file * file )
{
return seq_open_net ( inode , file , & pppol2tp_seq_ops ,
sizeof ( struct pppol2tp_seq_data ) ) ;
}
static const struct file_operations pppol2tp_proc_fops = {
. open = pppol2tp_proc_open ,
. read = seq_read ,
. llseek = seq_lseek ,
. release = seq_release_net ,
} ;
# endif /* CONFIG_PROC_FS */
/*****************************************************************************
* Network namespace
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
static __net_init int pppol2tp_init_net ( struct net * net )
{
struct proc_dir_entry * pde ;
int err = 0 ;
2013-02-18 05:34:54 +04:00
pde = proc_create ( " pppol2tp " , S_IRUGO , net - > proc_net ,
& pppol2tp_proc_fops ) ;
2010-04-02 10:18:33 +04:00
if ( ! pde ) {
err = - ENOMEM ;
goto out ;
}
out :
return err ;
}
static __net_exit void pppol2tp_exit_net ( struct net * net )
{
2013-02-18 05:34:56 +04:00
remove_proc_entry ( " pppol2tp " , net - > proc_net ) ;
2010-04-02 10:18:33 +04:00
}
static struct pernet_operations pppol2tp_net_ops = {
. init = pppol2tp_init_net ,
. exit = pppol2tp_exit_net ,
. id = & pppol2tp_net_id ,
} ;
/*****************************************************************************
* Init and cleanup
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
static const struct proto_ops pppol2tp_ops = {
. family = AF_PPPOX ,
. owner = THIS_MODULE ,
. release = pppol2tp_release ,
. bind = sock_no_bind ,
. connect = pppol2tp_connect ,
. socketpair = sock_no_socketpair ,
. accept = sock_no_accept ,
. getname = pppol2tp_getname ,
. poll = datagram_poll ,
. listen = sock_no_listen ,
. shutdown = sock_no_shutdown ,
. setsockopt = pppol2tp_setsockopt ,
. getsockopt = pppol2tp_getsockopt ,
. sendmsg = pppol2tp_sendmsg ,
. recvmsg = pppol2tp_recvmsg ,
. mmap = sock_no_mmap ,
. ioctl = pppox_ioctl ,
} ;
2010-09-21 10:43:54 +04:00
static const struct pppox_proto pppol2tp_proto = {
2010-04-02 10:18:33 +04:00
. create = pppol2tp_create ,
2013-07-02 05:02:07 +04:00
. ioctl = pppol2tp_ioctl ,
. owner = THIS_MODULE ,
2010-04-02 10:18:33 +04:00
} ;
2010-04-02 10:19:10 +04:00
# ifdef CONFIG_L2TP_V3
static const struct l2tp_nl_cmd_ops pppol2tp_nl_cmd_ops = {
. session_create = pppol2tp_session_create ,
2013-03-19 10:11:21 +04:00
. session_delete = l2tp_session_delete ,
2010-04-02 10:19:10 +04:00
} ;
# endif /* CONFIG_L2TP_V3 */
2010-04-02 10:18:33 +04:00
static int __init pppol2tp_init ( void )
{
int err ;
err = register_pernet_device ( & pppol2tp_net_ops ) ;
if ( err )
goto out ;
err = proto_register ( & pppol2tp_sk_proto , 0 ) ;
if ( err )
goto out_unregister_pppol2tp_pernet ;
err = register_pppox_proto ( PX_PROTO_OL2TP , & pppol2tp_proto ) ;
if ( err )
goto out_unregister_pppol2tp_proto ;
2010-04-02 10:19:10 +04:00
# ifdef CONFIG_L2TP_V3
err = l2tp_nl_register_ops ( L2TP_PWTYPE_PPP , & pppol2tp_nl_cmd_ops ) ;
if ( err )
goto out_unregister_pppox ;
# endif
2012-05-16 13:55:56 +04:00
pr_info ( " PPPoL2TP kernel driver, %s \n " , PPPOL2TP_DRV_VERSION ) ;
2010-04-02 10:18:33 +04:00
out :
return err ;
2010-04-02 10:19:10 +04:00
# ifdef CONFIG_L2TP_V3
out_unregister_pppox :
unregister_pppox_proto ( PX_PROTO_OL2TP ) ;
# endif
2010-04-02 10:18:33 +04:00
out_unregister_pppol2tp_proto :
proto_unregister ( & pppol2tp_sk_proto ) ;
out_unregister_pppol2tp_pernet :
unregister_pernet_device ( & pppol2tp_net_ops ) ;
goto out ;
}
static void __exit pppol2tp_exit ( void )
{
2010-04-02 10:19:10 +04:00
# ifdef CONFIG_L2TP_V3
l2tp_nl_unregister_ops ( L2TP_PWTYPE_PPP ) ;
# endif
2010-04-02 10:18:33 +04:00
unregister_pppox_proto ( PX_PROTO_OL2TP ) ;
proto_unregister ( & pppol2tp_sk_proto ) ;
unregister_pernet_device ( & pppol2tp_net_ops ) ;
}
module_init ( pppol2tp_init ) ;
module_exit ( pppol2tp_exit ) ;
MODULE_AUTHOR ( " James Chapman <jchapman@katalix.com> " ) ;
MODULE_DESCRIPTION ( " PPP over L2TP over UDP " ) ;
MODULE_LICENSE ( " GPL " ) ;
MODULE_VERSION ( PPPOL2TP_DRV_VERSION ) ;
2015-12-02 18:27:39 +03:00
MODULE_ALIAS_NET_PF_PROTO ( PF_PPPOX , PX_PROTO_OL2TP ) ;
2017-04-03 14:23:15 +03:00
MODULE_ALIAS_L2TP_PWTYPE ( 7 ) ;
