[PATCH net] ibmvnic: fix login buffer memory leak

[PATCH net] ibmvnic: fix login buffer memory leak

[Lijun Pan]

Commit 34f0f4e3f488 ("ibmvnic: Fix login buffer memory leaks") frees
login_rsp_buffer in release_resources() and send_login()
because handle_login_rsp() does not free it.
Commit f3ae59c0c015 ("ibmvnic: store RX and TX subCRQ handle array in
ibmvnic_adapter struct") frees login_rsp_buffer in handle_login_rsp().
It seems unnecessary to free it in release_resources() and send_login().
There are chances that handle_login_rsp returns earlier without freeing
buffers. Double-checking the buffer is harmless since
release_login_buffer and release_login_rsp_buffer will
do nothing if buffer is already freed.

Fixes: f3ae59c0c015 ("ibmvnic: store RX and TX subCRQ handle array in ibmvnic_adapter struct")
Fixes: 34f0f4e3f488 ("ibmvnic: Fix login buffer memory leaks")
Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
---
 drivers/net/ethernet/ibm/ibmvnic.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index aa9b6ad14472..2cee6fea7540 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -934,6 +934,7 @@ static void release_resources(struct ibmvnic_adapter *adapter)
 	release_rx_pools(adapter);
 
 	release_napi(adapter);
+	release_login_buffer(adapter);
 	release_login_rsp_buffer(adapter);
 }
 
@@ -3730,7 +3731,9 @@ static int send_login(struct ibmvnic_adapter *adapter)
 		return -1;
 	}
 
+	release_login_buffer(adapter);
 	release_login_rsp_buffer(adapter);
+
 	client_data_len = vnic_client_data_len(adapter);
 
 	buffer_size =
-- 
2.23.0

Re: [PATCH net] ibmvnic: fix login buffer memory leak

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Sat, 19 Dec 2020 15:39:19 -0600 you wrote:
> Commit 34f0f4e3f488 ("ibmvnic: Fix login buffer memory leaks") frees
> login_rsp_buffer in release_resources() and send_login()
> because handle_login_rsp() does not free it.
> Commit f3ae59c0c015 ("ibmvnic: store RX and TX subCRQ handle array in
> ibmvnic_adapter struct") frees login_rsp_buffer in handle_login_rsp().
> It seems unnecessary to free it in release_resources() and send_login().
> There are chances that handle_login_rsp returns earlier without freeing
> buffers. Double-checking the buffer is harmless since
> release_login_buffer and release_login_rsp_buffer will
> do nothing if buffer is already freed.
> 
> [...]

Here is the summary with links:
  - [net] ibmvnic: fix login buffer memory leak
    https://git.kernel.org/netdev/net/c/a0c8be56affa

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html