]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: mpi3mr: Fix locking in an error path
authorBart Van Assche <bvanassche@acm.org>
Mon, 10 Feb 2025 20:39:35 +0000 (12:39 -0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 19 Feb 2025 02:36:08 +0000 (21:36 -0500)
Make all error paths unlock rioc->bsg_cmds.mutex.

This patch fixes the following Clang -Wthread-safety errors:

drivers/scsi/mpi3mr/mpi3mr_app.c:2835:1: error: mutex 'mrioc->bsg_cmds.mutex' is not held on every path through here [-Werror,-Wthread-safety-analysis]
 2835 | }
      | ^
drivers/scsi/mpi3mr/mpi3mr_app.c:2332:6: note: mutex acquired here
 2332 |         if (mutex_lock_interruptible(&mrioc->bsg_cmds.mutex))
      |             ^
./include/linux/mutex.h:172:40: note: expanded from macro 'mutex_lock_interruptible'
  172 | #define mutex_lock_interruptible(lock) mutex_lock_interruptible_nested(lock, 0)
      |                                        ^

Cc: Sathya Prakash <sathya.prakash@broadcom.com>
Fixes: fb231d7deffb ("scsi: mpi3mr: Support for preallocation of SGL BSG data buffers part-2")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20250210203936.2946494-2-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/mpi3mr/mpi3mr_app.c

index 4ff9a73a7960f2543b161b369edceec9d6a8d2ef..f36663613950257a925a599a12c6cd88870d8569 100644 (file)
@@ -2425,6 +2425,7 @@ static long mpi3mr_bsg_process_mpt_cmds(struct bsg_job *job)
        }
 
        if (!mrioc->ioctl_sges_allocated) {
+               mutex_unlock(&mrioc->bsg_cmds.mutex);
                dprint_bsg_err(mrioc, "%s: DMA memory was not allocated\n",
                               __func__);
                return -ENOMEM;