From: Matthias Dellweg <2500@gmx.de>
To: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
Vasiliy Kulikov <segooon@gmail.com>,
Michal Sojka <sojkam1@fel.cvut.cz>, Arnd Bergmann <arnd@arndb.de>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] enable usb control message with class specific request
Date: Fri, 23 Sep 2011 09:05:50 +0200 [thread overview]
Message-ID: <20110923090550.43ec1fd1@horus> (raw)
In-Reply-To: <20110922235656.1f821c1f@horus>
Am Thu, 22 Sep 2011 23:56:56 +0200
schrieb Matthias Dellweg <2500@gmx.de>:
> + if ((requesttype == 0xa1) && (request == 0x00)
> + && (usb_find_alt_setting(ps->dev->actconfig, index >> 8,
> index & 0xff)
> + ->desc.bInterfaceClass == USB_CLASS_PRINTER))
> + index >>= 8;
I just woke up and realised this is a very bad idea if there is no such
setting...
So here's the next version I'd like to propose for comments:
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 37518df..d2efc97 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -607,9 +607,10 @@ static int findintfep(struct usb_device *dev, unsigned int ep)
}
static int check_ctrlrecip(struct dev_state *ps, unsigned int requesttype,
- unsigned int index)
+ unsigned int request, unsigned int index)
{
int ret = 0;
+ struct usb_host_interface *alt_setting;
if (ps->dev->state != USB_STATE_UNAUTHENTICATED
&& ps->dev->state != USB_STATE_ADDRESS
@@ -618,6 +619,15 @@ static int check_ctrlrecip(struct dev_state *ps, unsigned int requesttype,
if (USB_TYPE_VENDOR == (USB_TYPE_MASK & requesttype))
return 0;
+ /* check for the special corner case 'get_device_id' in the printer class specification,
+ * where wIndex is (configuration << 8 | altsetting) */
+ if ((requesttype == 0xa1) && (request == 0x00))
+ {
+ alt_setting = usb_find_alt_setting(ps->dev->actconfig, index >> 8, index & 0xff);
+ if (alt_setting && (alt_setting->desc.bInterfaceClass == USB_CLASS_PRINTER))
+ index >>= 8;
+ }
+
index &= 0xff;
switch (requesttype & USB_RECIP_MASK) {
case USB_RECIP_ENDPOINT:
@@ -770,7 +780,7 @@ static int proc_control(struct dev_state *ps, void __user *arg)
if (copy_from_user(&ctrl, arg, sizeof(ctrl)))
return -EFAULT;
- ret = check_ctrlrecip(ps, ctrl.bRequestType, ctrl.wIndex);
+ ret = check_ctrlrecip(ps, ctrl.bRequestType, ctrl.bRequest, ctrl.wIndex);
if (ret)
return ret;
wLength = ctrl.wLength; /* To suppress 64k PAGE_SIZE warning */
@@ -1100,7 +1110,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
kfree(dr);
return -EINVAL;
}
- ret = check_ctrlrecip(ps, dr->bRequestType,
+ ret = check_ctrlrecip(ps, dr->bRequestType, dr->bRequest,
le16_to_cpup(&dr->wIndex));
if (ret) {
kfree(dr);
next prev parent reply other threads:[~2011-09-23 7:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-22 10:10 [PATCH] enable usb control message with class specific request Matthias Dellweg
2011-09-22 15:12 ` Alan Stern
2011-09-22 21:56 ` Matthias Dellweg
2011-09-23 7:05 ` Matthias Dellweg [this message]
2011-09-23 16:16 ` Alan Stern
2011-09-23 17:57 ` Matthias Dellweg
2011-09-23 18:31 ` Alan Stern
2011-09-25 12:46 ` Matthias Dellweg
2011-09-26 22:34 ` [PATCH] usb/core/devio.c: Check for printer " Greg KH
2011-09-26 23:24 ` Matthias Dellweg
2011-09-26 23:31 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110923090550.43ec1fd1@horus \
--to=2500@gmx.de \
--cc=arnd@arndb.de \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=segooon@gmail.com \
--cc=sojkam1@fel.cvut.cz \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox