]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
USB: usbtmc: use interruptible sleep in usbtmc_read
authorOliver Neukum <oneukum@suse.com>
Wed, 30 Apr 2025 13:48:10 +0000 (15:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 May 2025 15:40:37 +0000 (17:40 +0200)
usbtmc_read() calls usbtmc_generic_read()
which uses interruptible sleep, but usbtmc_read()
itself uses uninterruptble sleep for mutual exclusion
between threads. That makes no sense.
Both should use interruptible sleep.

Fixes: 5b775f672cc99 ("USB: add USB test and measurement class driver")
Cc: stable <stable@kernel.org>
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Link: https://lore.kernel.org/r/20250430134810.226015-1-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/class/usbtmc.c

index 34e46ef308abfd09663f3121808277614db60505..634c3bcbb413e48e4221549351b524e7a86535d3 100644 (file)
@@ -1380,7 +1380,10 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
        if (!buffer)
                return -ENOMEM;
 
-       mutex_lock(&data->io_mutex);
+       retval = mutex_lock_interruptible(&data->io_mutex);
+       if (retval < 0)
+               goto exit_nolock;
+
        if (data->zombie) {
                retval = -ENODEV;
                goto exit;
@@ -1503,6 +1506,7 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf,
 
 exit:
        mutex_unlock(&data->io_mutex);
+exit_nolock:
        kfree(buffer);
        return retval;
 }