[1/2,RESEND] nvme-auth: unlock mutex in one place only

Message ID 20231011084512.1835614-1-shiftee@posteo.net
State New
Headers
Series [1/2,RESEND] nvme-auth: unlock mutex in one place only |

Commit Message

Mark O'Donovan Oct. 11, 2023, 8:45 a.m. UTC
  Signed-off-by: Mark O'Donovan <shiftee@posteo.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
 drivers/nvme/host/auth.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
  

Comments

Keith Busch Nov. 14, 2023, 2:04 p.m. UTC | #1
On Wed, Oct 11, 2023 at 08:45:11AM +0000, Mark O'Donovan wrote:
> Signed-off-by: Mark O'Donovan <shiftee@posteo.net>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
> Reviewed-by: Hannes Reinecke <hare@suse.de>

Applied to nvme-6.7, thanks!
  
Sagi Grimberg Nov. 20, 2023, 11 a.m. UTC | #2
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
  

Patch

diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
index daf5d144a8ea..e1a98647c3a2 100644
--- a/drivers/nvme/host/auth.c
+++ b/drivers/nvme/host/auth.c
@@ -758,12 +758,11 @@  static void nvme_queue_auth_work(struct work_struct *work)
 		__func__, chap->qid);
 	mutex_lock(&ctrl->dhchap_auth_mutex);
 	ret = nvme_auth_dhchap_setup_host_response(ctrl, chap);
+	mutex_unlock(&ctrl->dhchap_auth_mutex);
 	if (ret) {
-		mutex_unlock(&ctrl->dhchap_auth_mutex);
 		chap->error = ret;
 		goto fail2;
 	}
-	mutex_unlock(&ctrl->dhchap_auth_mutex);
 
 	/* DH-HMAC-CHAP Step 3: send reply */
 	dev_dbg(ctrl->device, "%s: qid %d send reply\n",