]> git.baikalelectronics.ru Git - kernel.git/commitdiff
rxrpc: Fix local destruction being repeated
authorDavid Howells <dhowells@redhat.com>
Fri, 6 May 2022 22:55:21 +0000 (23:55 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Sep 2022 09:03:58 +0000 (11:03 +0200)
[ Upstream commit 632933d0fffb600ba5327df70cb8c3a9a9766cf8 ]

If the local processor work item for the rxrpc local endpoint gets requeued
by an event (such as an incoming packet) between it getting scheduled for
destruction and the UDP socket being closed, the rxrpc_local_destroyer()
function can get run twice.  The second time it can hang because it can end
up waiting for cleanup events that will never happen.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/rxrpc/local_object.c

index 01135e54d95d2c6f7cffc3010e0c2ca7beb2761c..fc784fcc3a947b8393921bef075de9324241cb26 100644 (file)
@@ -448,6 +448,9 @@ static void rxrpc_local_processor(struct work_struct *work)
                container_of(work, struct rxrpc_local, processor);
        bool again;
 
+       if (local->dead)
+               return;
+
        trace_rxrpc_local(local->debug_id, rxrpc_local_processing,
                          atomic_read(&local->usage), NULL);