linux-kernel - Re: [PATCH 2/4] input: tablet: pegasus_notetaker: Fix usb

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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160720212943.GA26006@dtor-ws>
Date:	Wed, 20 Jul 2016 14:29:43 -0700
From:	Dmitry Torokhov <dmitry.torokhov@...il.com>
To:	Martin Kepplinger <martink@...teo.de>
Cc:	linux-kernel@...r.kernel.org, linux-input@...r.kernel.org
Subject: Re: [PATCH 2/4] input: tablet: pegasus_notetaker: Fix usb_autopm
 calls to be balanced

On Mon, Jul 18, 2016 at 04:29:07PM +0200, Martin Kepplinger wrote:
> Signed-off-by: Martin Kepplinger <martink@...teo.de>
> ---
>  drivers/input/tablet/pegasus_notetaker.c | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/input/tablet/pegasus_notetaker.c b/drivers/input/tablet/pegasus_notetaker.c
> index 27cb352..fdbc5e8 100644
> --- a/drivers/input/tablet/pegasus_notetaker.c
> +++ b/drivers/input/tablet/pegasus_notetaker.c
> @@ -208,27 +208,30 @@ static int pegasus_open(struct input_dev *dev)
>  		return retval;
>  
>  	pegasus->irq->dev = pegasus->usbdev;
> -	if (usb_submit_urb(pegasus->irq, GFP_KERNEL))
> +	if (usb_submit_urb(pegasus->irq, GFP_KERNEL)) {
>  		retval = -EIO;
> +		goto out;
> +	}
>  
>  	retval = pegasus_set_mode(pegasus, PEN_MODE_XY, NOTETAKER_LED_MOUSE);

If this fails I we should kill URB and cancel work. I adjusted and
applied.

>  
> -	usb_autopm_put_interface(pegasus->intf);
> +out:
>  
> -	return retval;
> +	if (retval < 0) {
> +		usb_autopm_put_interface(pegasus->intf);
> +		return retval;
> +	} else {
> +		return 0;
> +	}
>  }
>  
>  static void pegasus_close(struct input_dev *dev)
>  {
>  	struct pegasus *pegasus = input_get_drvdata(dev);
> -	int autopm_error;
>  
> -	autopm_error = usb_autopm_get_interface(pegasus->intf);
>  	usb_kill_urb(pegasus->irq);
>  	cancel_work_sync(&pegasus->init);
> -
> -	if (!autopm_error)
> -		usb_autopm_put_interface(pegasus->intf);
> +	usb_autopm_put_interface(pegasus->intf);
>  }
>  
>  static int pegasus_probe(struct usb_interface *intf,
> -- 
> 2.1.4
> 

-- 
Dmitry