Patchwork ACK: [PATCH oneiric] SRU: Kernel does not report some USB printers correctly, making them not being detected by CUPS

login
register
mail settings
Submitter Tim Gardner
Date Oct. 12, 2011, 1:02 p.m.
Message ID <4E959002.5070501@canonical.com>
Download mbox | patch
Permalink /patch/119196/
State New
Headers show

Comments

Tim Gardner - Oct. 12, 2011, 1:02 p.m.
Attached is the proper patch.
Andy Whitcroft - Oct. 12, 2011, 1:48 p.m.
On Wed, Oct 12, 2011 at 02:02:58PM +0100, Tim Gardner wrote:
> Attached is the proper patch.

I think I saw that gregkh has pulled this into stable so we might also
look there for the official commits.

Looks good.


Acked-by: Andy Whitcroft <apw@canonical.com>

> Tim Gardner tim.gardner@canonical.com

> From 79b1e1b1dccfd4b17d3b3f4852879ffab342ad32 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Wed, 12 Oct 2011 06:43:21 -0600
> Subject: [PATCH] UBUNTU: SAUCE: usb/core/devio.c: Check for printer class specific request
> 
> BugLink: http://bugs.launchpad.net/bugs/872711
> 
> Scraped from https://lkml.org/lkml/2011/9/26/371. Watch for the official
> patch once merged in 3.2
> 
> In the usb printer class specific request get_device_id the value of
> wIndex is (interface << 8 | altsetting) instead of just interface.
> This enables the detection of some printers with libusb.
> 
> Acked-by: Alan Stern <stern@rowland.harvard.edu>
> Signed-off-by: Matthias Dellweg <2500@gmx.de>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  drivers/usb/core/devio.c |   21 ++++++++++++++++++---
>  1 files changed, 18 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
> index 37518df..1d73709 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,19 @@ 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 (interface << 8 | altsetting)
> +	 * instead of just interface
> +	 */
> +	if (requesttype == 0xa1 && request == 0) {
> +		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 +784,8 @@ 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 +1115,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);
> -- 
> 1.7.0.4
> 

> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Leann Ogasawara - Oct. 12, 2011, 1:49 p.m.
On Wed, 2011-10-12 at 14:02 +0100, Tim Gardner wrote:
> Attached is the proper patch.

Hi Till,

Since you are able to reproduce the bug, I've built a test kernel for
you with the patch applied.  It can be found at the following location.
If test results are positive, I'll Ack this.

http://people.canonical.com/~ogasawara/lp872711/

Pending test results, Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Till Kamppeter - Oct. 12, 2011, 2:07 p.m.
Perfect! It works now. My printer is also recognized by the USB backend. 
So everything ready for the SRU.

Thank you very much.

    Till


On 10/12/2011 03:49 PM, Leann Ogasawara wrote:
> On Wed, 2011-10-12 at 14:02 +0100, Tim Gardner wrote:
>> Attached is the proper patch.
>
> Hi Till,
>
> Since you are able to reproduce the bug, I've built a test kernel for
> you with the patch applied.  It can be found at the following location.
> If test results are positive, I'll Ack this.
>
> http://people.canonical.com/~ogasawara/lp872711/
>
> Pending test results, Acked-by: Leann Ogasawara<leann.ogasawara@canonical.com>
>
>
Leann Ogasawara - Oct. 12, 2011, 2:24 p.m.
On Wed, 2011-10-12 at 16:07 +0200, Till Kamppeter wrote:
> Perfect! It works now. My printer is also recognized by the USB backend. 
> So everything ready for the SRU.

Thanks.  Applied to Oneiric master-next.  It'll be uploaded in the first
Oneiric kernel SRU.

Thanks,
Leann

> On 10/12/2011 03:49 PM, Leann Ogasawara wrote:
> > On Wed, 2011-10-12 at 14:02 +0100, Tim Gardner wrote:
> >> Attached is the proper patch.
> >
> > Hi Till,
> >
> > Since you are able to reproduce the bug, I've built a test kernel for
> > you with the patch applied.  It can be found at the following location.
> > If test results are positive, I'll Ack this.
> >
> > http://people.canonical.com/~ogasawara/lp872711/
> >
> > Pending test results, Acked-by: Leann Ogasawara<leann.ogasawara@canonical.com>
> >
> >
>

Patch

From 79b1e1b1dccfd4b17d3b3f4852879ffab342ad32 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Wed, 12 Oct 2011 06:43:21 -0600
Subject: [PATCH] UBUNTU: SAUCE: usb/core/devio.c: Check for printer class specific request

BugLink: http://bugs.launchpad.net/bugs/872711

Scraped from https://lkml.org/lkml/2011/9/26/371. Watch for the official
patch once merged in 3.2

In the usb printer class specific request get_device_id the value of
wIndex is (interface << 8 | altsetting) instead of just interface.
This enables the detection of some printers with libusb.

Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Matthias Dellweg <2500@gmx.de>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 drivers/usb/core/devio.c |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 37518df..1d73709 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,19 @@  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 (interface << 8 | altsetting)
+	 * instead of just interface
+	 */
+	if (requesttype == 0xa1 && request == 0) {
+		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 +784,8 @@  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 +1115,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);
-- 
1.7.0.4