This is a note to let you know that I've just added the patch titled
ibmvnic: Unmap DMA login rsp buffer on send login fail
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ibmvnic-unmap-dma-login-rsp-buffer-on-send-login-fail.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 411c565b4bc63e9584a8493882bd566e35a90588 Mon Sep 17 00:00:00 2001
From: Nick Child <nnac123@xxxxxxxxxxxxx>
Date: Wed, 9 Aug 2023 17:10:35 -0500
Subject: ibmvnic: Unmap DMA login rsp buffer on send login fail
From: Nick Child <nnac123@xxxxxxxxxxxxx>
commit 411c565b4bc63e9584a8493882bd566e35a90588 upstream.
If the LOGIN CRQ fails to send then we must DMA unmap the response
buffer. Previously, if the CRQ failed then the memory was freed without
DMA unmapping.
Fixes: c98d9cc4170d ("ibmvnic: send_login should check for crq errors")
Signed-off-by: Nick Child <nnac123@xxxxxxxxxxxxx>
Reviewed-by: Simon Horman <horms@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230809221038.51296-2-nnac123@xxxxxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/ibm/ibmvnic.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -4626,11 +4626,14 @@ static int send_login(struct ibmvnic_ada
if (rc) {
adapter->login_pending = false;
netdev_err(adapter->netdev, "Failed to send login, rc=%d\n", rc);
- goto buf_rsp_map_failed;
+ goto buf_send_failed;
}
return 0;
+buf_send_failed:
+ dma_unmap_single(dev, rsp_buffer_token, rsp_buffer_size,
+ DMA_FROM_DEVICE);
buf_rsp_map_failed:
kfree(login_rsp_buffer);
adapter->login_rsp_buf = NULL;
Patches currently in stable-queue which might be from nnac123@xxxxxxxxxxxxx are
queue-6.1/ibmvnic-handle-dma-unmapping-of-login-buffs-in-release-functions.patch
queue-6.1/ibmvnic-enforce-stronger-sanity-checks-on-login-response.patch
queue-6.1/ibmvnic-ensure-login-failure-recovery-is-safe-from-other-resets.patch
queue-6.1/ibmvnic-unmap-dma-login-rsp-buffer-on-send-login-fail.patch
queue-6.1/ibmvnic-do-partial-reset-on-login-failure.patch
