linux-kernel - [PATCH v2] USB: usblp: return error when setting unsupported protocol

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20241212143852.671889-1-jerrysteve1101@gmail.com>
Date: Thu, 12 Dec 2024 22:38:52 +0800
From: Jun Yan <jerrysteve1101@...il.com>
To: gregkh@...uxfoundation.org,
	zaitcev@...hat.com
Cc: linux-usb@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	kernel@...emyfiggins.com,
	Jun Yan <jerrysteve1101@...il.com>
Subject: [PATCH v2] USB: usblp: return error when setting unsupported protocol

Fix the regression introduced by commit d8c6edfa3f4e ("USB:
usblp: don't call usb_set_interface if there's a single alt"),
which causes that unsupported protocols can also be set via
ioctl when the num_altsetting of the device is 1.

Move the check for protocol support to the earlier stage.

Fixes: d8c6edfa3f4e ("USB: usblp: don't call usb_set_interface if there's a single alt")
Cc: stable@...r.kernel.org
Signed-off-by: Jun Yan <jerrysteve1101@...il.com>

---
Changes in v2:
- add a line with Cc: stable@...r.kernel.org
- correct the typo in the commit message ("the num_altsetting of the device is 0." ->
  "the num_altsetting of the device is 1")
- Link to v1: https://lore.kernel.org/linux-usb/20241211154244.534745-1-jerrysteve1101@gmail.com/
---
 drivers/usb/class/usblp.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 5a2e43331064..ff1a941fd2ed 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -1337,11 +1337,12 @@ static int usblp_set_protocol(struct usblp *usblp, int protocol)
 	if (protocol < USBLP_FIRST_PROTOCOL || protocol > USBLP_LAST_PROTOCOL)
 		return -EINVAL;
 
+	alts = usblp->protocol[protocol].alt_setting;
+	if (alts < 0)
+		return -EINVAL;
+
 	/* Don't unnecessarily set the interface if there's a single alt. */
 	if (usblp->intf->num_altsetting > 1) {
-		alts = usblp->protocol[protocol].alt_setting;
-		if (alts < 0)
-			return -EINVAL;
 		r = usb_set_interface(usblp->dev, usblp->ifnum, alts);
 		if (r < 0) {
 			printk(KERN_ERR "usblp: can't set desired altsetting %d on interface %d\n",
-- 
2.47.1