kevin/linux
1
Fork 0
Code

l2tp: Serialize access to sk_user_data with sk_callback_lock

Browse Source 
sk->sk_user_data has multiple users, which are not compatible with each
other. Writers must synchronize by grabbing the sk->sk_callback_lock.

l2tp currently fails to grab the lock when modifying the underlying tunnel
socket fields. Fix it by adding appropriate locking.

We err on the side of safety and grab the sk_callback_lock also inside the
sk_destruct callback overridden by l2tp, even though there should be no
refs allowing access to the sock at the time when sk_destruct gets called.

v4:
- serialize write to sk_user_data in l2tp sk_destruct

v3:
- switch from sock lock to sk_callback_lock
- document write-protection for sk_user_data

v2:
- update Fixes to point to origin of the bug
- use real names in Reported/Tested-by tags

Cc: Tom Parkin <tparkin@katalix.com>
Fixes: 3557baabf2 ("[L2TP]: PPP over L2TP driver core")
Reported-by: Haowei Yan <g1042620637@gmail.com>
Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Sitnicki 2022-11-14 20:16:19 +01:00 committed by David S. Miller
parent f524b7289b
commit b68777d54f
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/sock.h
View File

@ -323,7 +323,7 @@ struct sk_filter;
* @sk_tskey: counter to disambiguate concurrent tstamp requests * @sk_tskey: counter to disambiguate concurrent tstamp requests
* @sk_zckey: counter to order MSG_ZEROCOPY notifications * @sk_zckey: counter to order MSG_ZEROCOPY notifications
* @sk_socket: Identd and reporting IO signals * @sk_socket: Identd and reporting IO signals
* @sk_user_data: RPC layer private data * @sk_user_data: RPC layer private data. Write-protected by @sk_callback_lock.
* @sk_frag: cached page frag * @sk_frag: cached page frag
* @sk_peek_off: current peek_offset value * @sk_peek_off: current peek_offset value
* @sk_send_head: front of stuff to transmit * @sk_send_head: front of stuff to transmit

19
net/l2tp/l2tp_core.c
View File

@ -1150,8 +1150,10 @@ static void l2tp_tunnel_destruct(struct sock *sk)
} }
/* Remove hooks into tunnel socket */ /* Remove hooks into tunnel socket */
write_lock_bh(&sk->sk_callback_lock);
sk->sk_destruct = tunnel->old_sk_destruct; sk->sk_destruct = tunnel->old_sk_destruct;
sk->sk_user_data = NULL; sk->sk_user_data = NULL;
write_unlock_bh(&sk->sk_callback_lock);
/* Call the original destructor */ /* Call the original destructor */
if (sk->sk_destruct) if (sk->sk_destruct)
@ -1469,16 +1471,18 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,
sock = sockfd_lookup(tunnel->fd, &ret); sock = sockfd_lookup(tunnel->fd, &ret);
if (!sock) if (!sock)
goto err; goto err;
ret = l2tp_validate_socket(sock->sk, net, tunnel->encap);
if (ret < 0)
goto err_sock;
} }
sk = sock->sk;
write_lock(&sk->sk_callback_lock);
ret = l2tp_validate_socket(sk, net, tunnel->encap);
if (ret < 0)
goto err_sock;
tunnel->l2tp_net = net; tunnel->l2tp_net = net;
pn = l2tp_pernet(net); pn = l2tp_pernet(net);
sk = sock->sk;
sock_hold(sk); sock_hold(sk);
tunnel->sock = sk; tunnel->sock = sk;
@ -1504,7 +1508,7 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,
setup_udp_tunnel_sock(net, sock, &udp_cfg); setup_udp_tunnel_sock(net, sock, &udp_cfg);
} else { } else {
sk->sk_user_data = tunnel; rcu_assign_sk_user_data(sk, tunnel);
} }
tunnel->old_sk_destruct = sk->sk_destruct; tunnel->old_sk_destruct = sk->sk_destruct;
@ -1518,6 +1522,7 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,
if (tunnel->fd >= 0) if (tunnel->fd >= 0)
sockfd_put(sock); sockfd_put(sock);
write_unlock(&sk->sk_callback_lock);
return 0; return 0;
err_sock: err_sock:
@ -1525,6 +1530,8 @@ err_sock:
sock_release(sock); sock_release(sock);
else else
sockfd_put(sock); sockfd_put(sock);
write_unlock(&sk->sk_callback_lock);
err: err:
return ret; return ret;
} }