]> git.itanic.dy.fi Git - linux-stable/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>
Fri, 23 Sep 2022 12:15:50 +0000 (14:15 +0200)
[ Upstream commit d3d863036d688313f8d566b87acd7d99daf82749 ]

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 ef43fe8bdd2ff223a4fffca38eb428f6e2e4f1df..1d15940f61d7e44ab185eef23f1fc460584a5495 100644 (file)
@@ -406,6 +406,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);