net: mctp: struct sock lifetime fixes
Jeremy Kerr
maintainercover net: mctp: struct sock lifetime fixes
This series is a set of fixes for the sock lifetime handling in the AF_MCTP code, fixing a uaf reported by Noam Rathaus <[email protected]>.
The Fixes: tags indicate the original patches affected, but some tweaking to backport to those commits may be needed; I have a separate branch with backports to 5.15 if that helps with stable trees.
Of course, any comments/queries most welcome.
Cheers,
Jeremy
---
Jeremy Kerr (3):
net: mctp: add an explicit reference from a mctp_sk_key to sock
net: mctp: move expiry timer delete to unhash
net: mctp: mark socks as dead on unhash, prevent re-add
Paolo Abeni (1):
net: mctp: hold key reference when looking up a general key
net/mctp/af_mctp.c | 10 +++++++--- net/mctp/route.c | 34 +++++++++++++++++++++------------- 2 files changed, 28 insertions(+), 16 deletions(-)
Signature · 1 line
2.35.1
Jeremy Kerr
maintainerPATCH 1/4 net: mctp: add an explicit reference from a mctp_sk_key to sock
Currently, we correlate the mctp_sk_key lifetime to the sock lifetime through the sock hash/unhash operations, but this is pretty tenuous, and there are cases where we may have a temporary reference to an unhashed sk.
This change makes the reference more explicit, by adding a hold on the sock when it's associated with a mctp_sk_key, released on final key unref.
--- net/mctp/route.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
net/mctp/route.c +8 -6
@@ -147,6 +147,7 @@ static struct mctp_sk_key *mctp_key_alloc(struct mctp_sock *msk, key->valid = true;spin_lock_init (&key->lock);refcount_set (&key->refs,1 ); +sock_hold (key->sk);return key; }
@@ -165,6 +166,7 @@ void mctp_key_unref(struct mctp_sk_key *key)mctp_dev_release_key (key->dev, key);spin_unlock_irqrestore (&key->lock, flags); +sock_put (key->sk);kfree (key); }
@@ -419,14 +421,14 @@ static int mctp_route_input(struct mctp_route *route, struct sk_buff *skb)* this function. */ rc =mctp_key_add (key, msk); -if (rc) { -kfree (key); - }else { +if (!rc)trace_mctp_key_acquire (key); -/* we don't need to release key->lock on exit */ -mctp_key_unref (key); - } +/* we don't need to release key->lock on exit, so +* clean up here and suppress the unlock via +* setting to NULL +*/ +mctp_key_unref (key); key =NULL ; }else {
Signature · 1 line
2.35.1
Jeremy Kerr
maintainerPATCH 4/4 net: mctp: mark socks as dead on unhash, prevent re-add
In reply to Jeremy KerrOnce a socket has been unhashed, we want to prevent it from being re-used in a sk_key entry as part of a routing operation.
This change marks the sk as SOCK_DEAD on unhash, which prevents addition into the net's key list.
We need to do this during the key add path, rather than key lookup, as we release the net keys_lock between those operations.
--- net/mctp/af_mctp.c | 1 + net/mctp/route.c | 6 ++++++ 2 files changed, 7 insertions(+)
net/mctp/af_mctp.c +1 -0
@@ -577,6 +577,7 @@ static void mctp_sk_unhash(struct sock *sk)spin_lock_irqsave (&key->lock, fl2);__mctp_key_remove (key, net, fl2,MCTP_TRACE_KEY_CLOSED ); } +sock_set_flag (sk,SOCK_DEAD );spin_unlock_irqrestore (&net->mctp.keys_lock, flags);/* Since there are no more tag allocations (we have removed all of the
net/mctp/route.c +6 -0
@@ -179,6 +179,11 @@ static int mctp_key_add(struct mctp_sk_key *key, struct mctp_sock *msk)spin_lock_irqsave (&net->mctp.keys_lock, flags); +if (sock_flag (&msk->sk,SOCK_DEAD )) { + rc = -EINVAL ; + goto out_unlock; + } +hlist_for_each_entry (tmp, &net->mctp.keys, hlist) {if (mctp_key_match (tmp, key->local_addr, key->peer_addr, key->tag)) {
@@ -200,6 +205,7 @@ static int mctp_key_add(struct mctp_sk_key *key, struct mctp_sock *msk)hlist_add_head (&key->sklist, &msk->keys); } +out_unlock:spin_unlock_irqrestore (&net->mctp.keys_lock, flags);return rc;
Signature · 1 line
2.35.1
Jeremy Kerr
maintainerPATCH 2/4 net: mctp: move expiry timer delete to unhash
In reply to Jeremy KerrCurrently, we delete the key expiry timer (in sk->close) before unhashing the sk. This means that another thread may find the sk through its presence on the key list, and re-queue the timer.
This change moves the timer deletion to the unhash, after we have made the key no longer observable, so the timer cannot be re-queued.
--- net/mctp/af_mctp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/mctp/af_mctp.c +6 -3
@@ -544,9 +544,6 @@ static int mctp_sk_init(struct sock *sk)static void mctp_sk_close (struct sock *sk,long timeout) { - struct mctp_sock *msk = container_of(sk, struct mctp_sock, sk); - -del_timer_sync (&msk->key_expiry);sk_common_release (sk); }
@@ -581,6 +578,12 @@ static void mctp_sk_unhash(struct sock *sk)__mctp_key_remove (key, net, fl2,MCTP_TRACE_KEY_CLOSED ); }spin_unlock_irqrestore (&net->mctp.keys_lock, flags); + +/* Since there are no more tag allocations (we have removed all of the +* keys), stop any pending expiry events. the timer cannot be re-queued +* as the sk is no longer observable +*/ +del_timer_sync (&msk->key_expiry); }static struct proto mctp_proto = {
Signature · 1 line
2.35.1
Jeremy Kerr
maintainerPATCH 3/4 net: mctp: hold key reference when looking up a general key
In reply to Jeremy KerrFrom: Paolo Abeni <[email protected]>
Currently, we have a race where we look up a sock through a "general" (ie, not directly associated with the (src,dest,tag) tuple) key, then drop the key reference while still holding the key's sock.
This change expands the key reference until we've finished using the sock, and hence the sock reference too.
Commit message changes from Jeremy Kerr <[email protected]>.
--- net/mctp/route.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/mctp/route.c +7 -7
@@ -317,8 +317,8 @@ static int mctp_frag_queue(struct mctp_sk_key *key, struct sk_buff *skb)static int mctp_route_input (struct mctp_route *route,struct sk_buff *skb) { +struct mctp_sk_key *key, *any_key =NULL ;struct net *net =dev_net (skb->dev); -struct mctp_sk_key *key;struct mctp_sock *msk;struct mctp_hdr *mh;unsigned long f;
@@ -363,13 +363,11 @@ static int mctp_route_input(struct mctp_route *route, struct sk_buff *skb)* key for reassembly - we'll create a more specific * one for future packets if required (ie, !EOM). */ - key =mctp_lookup_key (net, skb,MCTP_ADDR_ANY , &f); -if (key) { - msk =container_of (key->sk, + any_key =mctp_lookup_key (net, skb,MCTP_ADDR_ANY , &f); +if (any_key) { + msk =container_of (any_key->sk, struct mctp_sock, sk); -spin_unlock_irqrestore (&key->lock, f); -mctp_key_unref (key); - key =NULL ; +spin_unlock_irqrestore (&any_key->lock, f); } }
@@ -475,6 +473,8 @@ static int mctp_route_input(struct mctp_route *route, struct sk_buff *skb)spin_unlock_irqrestore (&key->lock, f);mctp_key_unref (key); } +if (any_key) +mctp_key_unref (any_key); out:if (rc)kfree_skb (skb);
Signature · 1 line
2.35.1
This series was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Quoted 9 lines · On Tue, 24 Jan 2023 10:01:02 +0800 you wrote:
This series is a set of fixes for the sock lifetime handling in the
AF_MCTPcode, fixing a uaf reported by Noam Rathaus <[email protected]>.The Fixes: tags indicate the original patches affected, but some tweaking to backport to those commits may be needed; I have a separate branch with backports to 5.15 if that helps with stable trees.
[...]
Here is the summary with links:
- [net,1/4] net: mctp: add an explicit reference from a mctp_sk_key to sock
https://git.kernel.org/netdev/net/c/de8a6b15d965 - [net,2/4] net: mctp: move expiry timer delete to unhash https://git.kernel.org/netdev/net/c/5f41ae6fca9d - [net,3/4] net: mctp: hold key reference when looking up a general key https://git.kernel.org/netdev/net/c/6e54ea37e344 - [net,4/4] net: mctp: mark socks as dead on unhash, prevent re-add https://git.kernel.org/netdev/net/c/b98e1a04e27f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html