l2tp: Serialize access to sk_user_data with sk_callback_lock
authorJakub Sitnicki <jakub@cloudflare.com>
Mon, 14 Nov 2022 19:16:19 +0000 (20:16 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Nov 2022 12:52:19 +0000 (12:52 +0000)
commitb68777d54fac21fc833ec26ea1a2a84f975ab035
treebec75eaab58993c3245ac6d77c350f0b809e00b4
parentf524b7289bbb0c8ffaa2ba3c34c146e43da54fb2
l2tp: Serialize access to sk_user_data with sk_callback_lock

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: 3557baabf280 ("[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>
include/net/sock.h
net/l2tp/l2tp_core.c