AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

rxrpc: Fix rxrpc_peer leak in rxrpc_look_up_bundle()

Browse Source 
commit ca77fba821351190777b236ce749d7c4d353102e upstream.

Need to call rxrpc_put_peer() for bundle candidate before kfree() as it
holds a ref to rxrpc_peer.

[DH: v2: Changed to abstract out the bundle freeing code into a function]

Fixes: 245500d853 ("rxrpc: Rewrite the client connection manager")
Signed-off-by: Eiichi Tsukata <eiichi.tsukata@nutanix.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
Link: https://lore.kernel.org/r/20211121041608.133740-1-eiichi.tsukata@nutanix.com/ # v1
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eiichi Tsukata 2021-11-21 04:16:07 +00:00 committed by Greg Kroah-Hartman
parent 4afb32090a
commit 35b40f724c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/rxrpc/conn_client.c
View File

@ -135,16 +135,20 @@ struct rxrpc_bundle *rxrpc_get_bundle(struct rxrpc_bundle *bundle)
return bundle; return bundle;
} }
static void rxrpc_free_bundle(struct rxrpc_bundle *bundle)
{
rxrpc_put_peer(bundle->params.peer);
kfree(bundle);
}
void rxrpc_put_bundle(struct rxrpc_bundle *bundle) void rxrpc_put_bundle(struct rxrpc_bundle *bundle)
{ {
unsigned int d = bundle->debug_id; unsigned int d = bundle->debug_id;
unsigned int u = atomic_dec_return(&bundle->usage); unsigned int u = atomic_dec_return(&bundle->usage);
_debug("PUT B=%x %u", d, u); _debug("PUT B=%x %u", d, u);
if (u == 0) { if (u == 0)
rxrpc_put_peer(bundle->params.peer); rxrpc_free_bundle(bundle);
kfree(bundle);
}
} }
/* /*
@ -334,7 +338,7 @@ static struct rxrpc_bundle *rxrpc_look_up_bundle(struct rxrpc_conn_parameters *c
return candidate; return candidate;
found_bundle_free: found_bundle_free:
kfree(candidate); rxrpc_free_bundle(candidate);
found_bundle: found_bundle:
rxrpc_get_bundle(bundle); rxrpc_get_bundle(bundle);
spin_unlock(&local->client_bundles_lock); spin_unlock(&local->client_bundles_lock);