* [PATCH v2] USB: usblp: return error when setting unsupported protocol
@ 2024-12-12 14:38 Jun Yan
0 siblings, 0 replies; only message in thread
From: Jun Yan @ 2024-12-12 14:38 UTC (permalink / raw)
To: gregkh, zaitcev; +Cc: linux-usb, linux-kernel, kernel, Jun Yan
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@vger.kernel.org
Signed-off-by: Jun Yan <jerrysteve1101@gmail.com>
---
Changes in v2:
- add a line with Cc: stable@vger.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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-12-12 14:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-12-12 14:38 [PATCH v2] USB: usblp: return error when setting unsupported protocol Jun Yan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®