From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BA571C3BE0; Mon, 12 May 2025 17:48:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747072125; cv=none; b=sN0z9KrVVxYHF8MjzamYzcIFD+hKf1Fl1xs4sAfmP2GOdRShjNAH5jDCYFwCDFOb7i27d+UUQtYWE2w2dLMbze2mQNbDoA79uOBftt/1boJziX3sQ/IMv92/CE/KAd1YBmPukNHUuh6bDGxHBjSuCOWlKxrfRrgOxUZ4Q7glYKk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747072125; c=relaxed/simple; bh=tM6xqF5WCvMoE61kiiEi8Mz/w+TaofHSdgSelb8UOf4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ripsA8gB3wHP+CSqzsGgeMbvxMYJuCR0dKBhj9CYo+s2FYnPOKxoiqogGcUqXinI3teROdVUnDEUx3FaUWV5+vvug9Y8kXIBBU5bUj9lZX7pIrOmwPlfSh3KQs0RrCcpMEKJOHTyehyMiT3CxPd0ei1iv7OksSfrvp8cpxPPfMo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lX2ddQhw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lX2ddQhw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E36BC4CEE7; Mon, 12 May 2025 17:48:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747072125; bh=tM6xqF5WCvMoE61kiiEi8Mz/w+TaofHSdgSelb8UOf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lX2ddQhwgVIGWhR30dtA3s2aQjjucq0gXt81kgD6qqsTV+Yo77z0UcbJmmwyOm2B7 rnPvaSYHMPdGxTrQJ5adaL7+/TbsojDZJAEuH2o6Z3MzQu2nqkWB0dt6GRmmP+tv/c B04/6PxTPzNIGoBaxsj8fLRk4f25GGxPyC3mulmc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dave Penkler Subject: [PATCH 6.14 148/197] usb: usbtmc: Fix erroneous generic_read ioctl return Date: Mon, 12 May 2025 19:39:58 +0200 Message-ID: <20250512172050.417503829@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250512172044.326436266@linuxfoundation.org> References: <20250512172044.326436266@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Penkler commit 4e77d3ec7c7c0d9535ccf1138827cb9bb5480b9b upstream. wait_event_interruptible_timeout returns a long The return value was being assigned to an int causing an integer overflow when the remaining jiffies > INT_MAX which resulted in random error returns. Use a long return value, converting to the int ioctl return only on error. Fixes: bb99794a4792 ("usb: usbtmc: Add ioctl for vendor specific read") Cc: stable@vger.kernel.org Signed-off-by: Dave Penkler Link: https://lore.kernel.org/r/20250502070941.31819-4-dpenkler@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/class/usbtmc.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -833,6 +833,7 @@ static ssize_t usbtmc_generic_read(struc unsigned long expire; int bufcount = 1; int again = 0; + long wait_rv; /* mutex already locked */ @@ -945,19 +946,24 @@ static ssize_t usbtmc_generic_read(struc if (!(flags & USBTMC_FLAG_ASYNC)) { dev_dbg(dev, "%s: before wait time %lu\n", __func__, expire); - retval = wait_event_interruptible_timeout( + wait_rv = wait_event_interruptible_timeout( file_data->wait_bulk_in, usbtmc_do_transfer(file_data), expire); - dev_dbg(dev, "%s: wait returned %d\n", - __func__, retval); + dev_dbg(dev, "%s: wait returned %ld\n", + __func__, wait_rv); - if (retval <= 0) { - if (retval == 0) - retval = -ETIMEDOUT; + if (wait_rv < 0) { + retval = wait_rv; goto error; } + + if (wait_rv == 0) { + retval = -ETIMEDOUT; + goto error; + } + } urb = usb_get_from_anchor(&file_data->in_anchor);