From: Arnd Bergmann <arnd@arndb.de>
To: Daniel J Blueman <daniel.blueman@gmail.com>
Subject: Re: [2.6.35 patch] add missing unlock_kernel calls...
Date: Sun, 8 Aug 2010 16:58:19 +0200
User-Agent: KMail/1.12.2 (Linux/2.6.31-22-generic; KDE/4.3.2; x86_64; ; )
Cc: Roger Lucas <vt8231@hiddenengine.co.uk>,
        Linux Kernel <linux-kernel@vger.kernel.org>
References: <AANLkTi=G9+wqWhJmX7QarQXeSw-8qASXMrz6mKvbBNw2@mail.gmail.com>
In-Reply-To: <AANLkTi=G9+wqWhJmX7QarQXeSw-8qASXMrz6mKvbBNw2@mail.gmail.com>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201008081658.19790.arnd@arndb.de>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1392
Lines: 48

On Sunday 08 August 2010, Daniel J Blueman wrote:
> Hi Roger,
> 
> Here is a fix for 2.6.36-rc1:
> 
> Ensure the BKL is dropped along all paths.
> 
> Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
> 
> diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
> index c24d2fa..53263e7 100644
> --- a/drivers/hid/usbhid/hiddev.c
> +++ b/drivers/hid/usbhid/hiddev.c
> @@ -271,16 +271,18 @@ static int hiddev_open(struct inode *inode,
> struct file *file)
>  	lock_kernel();
>  	i = iminor(inode) - HIDDEV_MINOR_BASE;
> 
> -	if (i >= HIDDEV_MINORS || i < 0 || !hiddev_table[i])
> +	if (i >= HIDDEV_MINORS || i < 0 || !hiddev_table[i]) {
> +		unlock_kernel();
>  		return -ENODEV;
> +	}
> 
> -	if (!(list = kzalloc(sizeof(struct hiddev_list), GFP_KERNEL)))
> +	if (!(list = kzalloc(sizeof(struct hiddev_list), GFP_KERNEL))) {
> +		unlock_kernel();
>  		return -ENOMEM;
> -	mutex_init(&list->thread_lock);
> +	}
> 
> +	mutex_init(&list->thread_lock);
>  	list->hiddev = hiddev_table[i];
> -
> -
>  	file->private_data = list;
> 
>  	/*

This should no longer be needed, since the BKL is not taken
in this code any more.

	Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/