Skip to content

Commit e77fbef

Browse files
AlexNova-opsgregkh
authored andcommitted
net/tcp-ao: fix use-after-free of key in del_async path
commit 5ba9950 upstream. In tcp_ao_delete_key(), the del_async path skips the current_key and rnext_key validity checks present in the synchronous path, assuming these pointers are always NULL on LISTEN sockets. However, if a key was added with set_current=1/set_rnext=1 while the socket was in CLOSE state, current_key and rnext_key will be non-NULL after listen() transitions the socket to LISTEN. When such a key is deleted with del_async=1, hlist_del_rcu() and call_rcu() free the key without clearing the dangling pointers. After the RCU grace period, getsockopt(TCP_AO_INFO) dereferences current_key->sndid and rnext_key->rcvid from freed slab memory. Clear current_key and rnext_key in the del_async path when they reference the key being deleted. Fixes: d6732b9 ("net/tcp: Allow asynchronous delete for TCP-AO keys (MKTs)") Signed-off-by: HanQuan <eilaimemedsnaimel@gmail.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/20260623015208.1191687-1-eilaimemedsnaimel@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3d205fe commit e77fbef

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

net/ipv4/tcp_ao.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,6 +1776,10 @@ static int tcp_ao_delete_key(struct sock *sk, struct tcp_ao_info *ao_info,
17761776
* them and we can just free all resources in RCU fashion.
17771777
*/
17781778
if (del_async) {
1779+
if (ao_info->current_key == key)
1780+
WRITE_ONCE(ao_info->current_key, NULL);
1781+
if (ao_info->rnext_key == key)
1782+
WRITE_ONCE(ao_info->rnext_key, NULL);
17791783
atomic_sub(tcp_ao_sizeof_key(key), &sk->sk_omem_alloc);
17801784
call_rcu(&key->rcu, tcp_ao_key_free_rcu);
17811785
return 0;

0 commit comments

Comments
 (0)