[1/2] rxrpc: Fix rxrpc_peer leak in rxrpc_look_up_bundle()

Commit Message

David Howells Nov. 24, 2021, 2:37 p.m. UTC

From: Eiichi Tsukata <[e-mail]>

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: 245500d853e9 ("rxrpc: Rewrite the client connection manager")
Signed-off-by: Eiichi Tsukata <[e-mail]>
Signed-off-by: David Howells <[e-mail]>
cc: Marc Dionne <[e-mail]>
cc: [e-mail]
Link: https://lore.kernel.org/r/[e-mail]/ # v1
---

 net/rxrpc/conn_client.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Comments

Jakub Kicinski Nov. 26, 2021, 3:27 a.m. UTC | #1

On Wed, 24 Nov 2021 14:37:33 +0000 David Howells wrote:
> From: Eiichi Tsukata <[e-mail]>
> 
> 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: 245500d853e9 ("rxrpc: Rewrite the client connection manager")
> Signed-off-by: Eiichi Tsukata <[e-mail]>
> Signed-off-by: David Howells <[e-mail]>
> cc: Marc Dionne <[e-mail]>
> cc: [e-mail]
> Link: https://lore.kernel.org/r/[e-mail]/ # v1

Are these supposed to go to net? They are addressed To: the author.

David Howells Nov. 26, 2021, 8:05 a.m. UTC | #2

Jakub Kicinski <[e-mail]> wrote:

> Are these supposed to go to net? They are addressed To: the author.

I'm hoping the author rechecks/reviews them.  I commented on his original
submission that I thought they could be done slightly differently.

David

Eiichi Tsukata Nov. 26, 2021, 8:34 a.m. UTC | #3

> On Nov 26, 2021, at 17:05, David Howells <[e-mail]> wrote:
> 
> Jakub Kicinski <[e-mail]> wrote:
> 
>> Are these supposed to go to net? They are addressed To: the author.
> 
> I'm hoping the author rechecks/reviews them.  I commented on his original
> submission that I thought they could be done slightly differently.
> 

Thanks, I’ve tested them with my environment. Looks good.

Eiichi

Marc Dionne Nov. 26, 2021, 1:12 p.m. UTC | #4

On Wed, Nov 24, 2021 at 10:37 AM David Howells <[e-mail]> wrote:
>
> From: Eiichi Tsukata <[e-mail]>
>
> 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: 245500d853e9 ("rxrpc: Rewrite the client connection manager")
> Signed-off-by: Eiichi Tsukata <[e-mail]>
> Signed-off-by: David Howells <[e-mail]>
> cc: Marc Dionne <[e-mail]>
> cc: [e-mail]
> Link: https://lore.kernel.org/r/[e-mail]/ # v1
> ---
>
>  net/rxrpc/conn_client.c |   14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/net/rxrpc/conn_client.c b/net/rxrpc/conn_client.c
> index dbea0bfee48e..8120138dac01 100644
> --- a/net/rxrpc/conn_client.c
> +++ b/net/rxrpc/conn_client.c
> @@ -135,16 +135,20 @@ struct rxrpc_bundle *rxrpc_get_bundle(struct rxrpc_bundle *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)
>  {
>         unsigned int d = bundle->debug_id;
>         unsigned int u = atomic_dec_return(&bundle->usage);
>
>         _debug("PUT B=%x %u", d, u);
> -       if (u == 0) {
> -               rxrpc_put_peer(bundle->params.peer);
> -               kfree(bundle);
> -       }
> +       if (u == 0)
> +               rxrpc_free_bundle(bundle);
>  }
>
>  /*
> @@ -328,7 +332,7 @@ static struct rxrpc_bundle *rxrpc_look_up_bundle(struct rxrpc_conn_parameters *c
>         return candidate;
>
>  found_bundle_free:
> -       kfree(candidate);
> +       rxrpc_free_bundle(candidate);
>  found_bundle:
>         rxrpc_get_bundle(bundle);
>         spin_unlock(&local->client_bundles_lock);

Reviewed-by: Marc Dionne <[e-mail]>

Marc

David Howells Nov. 29, 2021, 3:40 p.m. UTC | #5

Eiichi Tsukata <[e-mail]> wrote:

> Thanks, I’ve tested them with my environment. Looks good.

Thanks.

David

David Howells Nov. 29, 2021, 3:53 p.m. UTC | #6

Hi Jakub,

> Are these supposed to go to net? They are addressed To: the author.

I've posted a new set to netdev that has the Acks from Marc added for you to
pick up.

David

Patch

diff --git a/net/rxrpc/conn_client.c b/net/rxrpc/conn_client.c
index dbea0bfee48e..8120138dac01 100644
--- a/net/rxrpc/conn_client.c
+++ b/net/rxrpc/conn_client.c
@@ -135,16 +135,20 @@  struct rxrpc_bundle *rxrpc_get_bundle(struct rxrpc_bundle *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)
 {
 	unsigned int d = bundle->debug_id;
 	unsigned int u = atomic_dec_return(&bundle->usage);
 
 	_debug("PUT B=%x %u", d, u);
-	if (u == 0) {
-		rxrpc_put_peer(bundle->params.peer);
-		kfree(bundle);
-	}
+	if (u == 0)
+		rxrpc_free_bundle(bundle);
 }
 
 /*
@@ -328,7 +332,7 @@  static struct rxrpc_bundle *rxrpc_look_up_bundle(struct rxrpc_conn_parameters *c
 	return candidate;
 
 found_bundle_free:
-	kfree(candidate);
+	rxrpc_free_bundle(candidate);
 found_bundle:
 	rxrpc_get_bundle(bundle);
 	spin_unlock(&local->client_bundles_lock);