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 6F4B729A326; Mon, 12 May 2025 18:10:43 +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=1747073443; cv=none; b=l7hlNomH0GZiHx01sJE2kJWTigo6suaoTTU/5IR3BnXcCJhIcRBCr7lQiYIogK54IuGcrH+thoKDAEqwNCWETxFeGB09n4qoxWRFqA1Nu506VOpu2EIhh1n3SW6Q/RHvwDsl5JVw59ArsS3VeW0CtKbY2g5AtazoJUS3X7w8PNw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747073443; c=relaxed/simple; bh=kvWR6uAKp7KFdJWsy+/doa0rYxCD/FHFhgRDWIX2ceQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H0cxCujKXgrnA2jHFxCZSNnzTYhSsmkZnNys5OMuTd+USYhO/LKINS5qyFf11i0FdPIr8xi0TMaghouKlj8p0UuDcz6qZU6FjeWv0xLT0JBnuOyEjQNdFwXjBjggwMZb2dLGt3GuqV/7bux7BK0KBxlHS0toXg8HR+VMEbhoxls= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dU/1hEvl; 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="dU/1hEvl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92CB2C4CEE7; Mon, 12 May 2025 18:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747073443; bh=kvWR6uAKp7KFdJWsy+/doa0rYxCD/FHFhgRDWIX2ceQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dU/1hEvlb6buh0/dbw+6OPHOjZVr6R7EoDFhSEHyhRxkcmbEy+vNA8ddfoJ5HLckq GzuMvrnPf7+mrVka15fDWqZTuoZRNCm7rGPoJFfXCtyK3Y0qaqoC74F4eSPm3Yeh8G R5cy/BefbAqGTSel19tZArjymTkAi0agmPqGQXeI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michael Katzmann , Dave Penkler Subject: [PATCH 6.6 076/113] usb: usbtmc: Fix erroneous get_stb ioctl error returns Date: Mon, 12 May 2025 19:46:05 +0200 Message-ID: <20250512172030.768068997@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250512172027.691520737@linuxfoundation.org> References: <20250512172027.691520737@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Penkler commit cac01bd178d6a2a23727f138d647ce1a0e8a73a1 upstream. wait_event_interruptible_timeout returns a long The return was being assigned to an int causing an integer overflow when the remaining jiffies > INT_MAX resulting in random error returns. Use a long return value and convert to int ioctl return only on error. When the return value of wait_event_interruptible_timeout was <= INT_MAX the number of remaining jiffies was returned which has no meaning for the user. Return 0 on success. Reported-by: Michael Katzmann Fixes: dbf3e7f654c0 ("Implement an ioctl to support the USMTMC-USB488 READ_STATUS_BYTE operation.") Cc: stable@vger.kernel.org Signed-off-by: Dave Penkler Link: https://lore.kernel.org/r/20250502070941.31819-2-dpenkler@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/class/usbtmc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -482,6 +482,7 @@ static int usbtmc_get_stb(struct usbtmc_ u8 *buffer; u8 tag; int rv; + long wait_rv; dev_dbg(dev, "Enter ioctl_read_stb iin_ep_present: %d\n", data->iin_ep_present); @@ -511,16 +512,17 @@ static int usbtmc_get_stb(struct usbtmc_ } if (data->iin_ep_present) { - rv = wait_event_interruptible_timeout( + wait_rv = wait_event_interruptible_timeout( data->waitq, atomic_read(&data->iin_data_valid) != 0, file_data->timeout); - if (rv < 0) { - dev_dbg(dev, "wait interrupted %d\n", rv); + if (wait_rv < 0) { + dev_dbg(dev, "wait interrupted %ld\n", wait_rv); + rv = wait_rv; goto exit; } - if (rv == 0) { + if (wait_rv == 0) { dev_dbg(dev, "wait timed out\n"); rv = -ETIMEDOUT; goto exit; @@ -539,6 +541,8 @@ static int usbtmc_get_stb(struct usbtmc_ dev_dbg(dev, "stb:0x%02x received %d\n", (unsigned int)*stb, rv); + rv = 0; + exit: /* bump interrupt bTag */ data->iin_bTag += 1;