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 EFFEF1A08CA; Mon, 12 May 2025 17:55:46 +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=1747072547; cv=none; b=SOuiYOZxOr45VrAnNYq+m6AsZyLVkS4ZOxoV9NFRvTKy8Sje4M6O11cfN4GA8YMG3yiQC9p+MjsX9wx5rRGzwtO/aA2Ic+NGHjjJmTTeoAlYg1URGFOJw16DTbU7i2n5ZvGeXQ/dJUwT+V4cmMsW9sRPK5BLT3sHHUFCQGPjdJs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747072547; c=relaxed/simple; bh=BZymYYfFjzMwLGPWRyUWKr6JmG9UN/iWQhCv7OcUiwA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RwIVo2bfewIwdV1KH71v3tHIPCrFcC/jEEgUQl0/yoWFhp/QZaTCkUP7DE0Chffw9QoNRD6qGkrLJdTVfBH/uqYC8rhJJCSGB04zymtByFr25ecgPXCvVeMU7TByVhEYXN6y7TfBdwtGAEUGienDkaKbS8la16Uc+lIdP4qs+yM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vKA0lZDa; 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="vKA0lZDa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8132CC4CEE7; Mon, 12 May 2025 17:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747072546; bh=BZymYYfFjzMwLGPWRyUWKr6JmG9UN/iWQhCv7OcUiwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vKA0lZDafkLdWs3tNntdHeYNP71WUKT4AWjq9IxCxk3F+DOqbApwbn5FDrdFfQvsq Ie+8tmA7jRYnhXlMkkpUZDpCKVNHuH1uwRXRhZTO3wVFjYxthIqAz9TgfWnhcEUbvx n2HItd9uMR7V4HMgdVRgVCzQ3OlhWhdNikbLwFqA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michael Katzmann , Dave Penkler Subject: [PATCH 6.1 57/92] usb: usbtmc: Fix erroneous get_stb ioctl error returns Date: Mon, 12 May 2025 19:45:32 +0200 Message-ID: <20250512172025.438343693@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250512172023.126467649@linuxfoundation.org> References: <20250512172023.126467649@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-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;