From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753430Ab1J2G1m (ORCPT ); Sat, 29 Oct 2011 02:27:42 -0400 Received: from acsinet15.oracle.com ([141.146.126.227]:40580 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752558Ab1J2G1k (ORCPT ); Sat, 29 Oct 2011 02:27:40 -0400 Date: Sat, 29 Oct 2011 09:24:13 +0300 From: Dan Carpenter To: Julia Lawall Cc: Jiri Kosina , kernel-janitors@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/5] drivers/hid/hid-roccat.c: eliminate a null pointer dereference Message-ID: <20111029062412.GG14881@longonot.mountain> References: <1319846297-2985-3-git-send-email-julia@diku.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1319846297-2985-3-git-send-email-julia@diku.dk> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: acsinet21.oracle.com [141.146.126.237] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090204.4EAB9CB9.008E,ss=1,re=0.000,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Oct 29, 2011 at 01:58:15AM +0200, Julia Lawall wrote: > diff --git a/drivers/hid/hid-roccat.c b/drivers/hid/hid-roccat.c > index 2596321..36a28b8 100644 > --- a/drivers/hid/hid-roccat.c > +++ b/drivers/hid/hid-roccat.c > @@ -163,14 +163,15 @@ static int roccat_open(struct inode *inode, struct file *file) > > device = devices[minor]; > > - mutex_lock(&device->readers_lock); > - > if (!device) { > pr_emerg("roccat device with minor %d doesn't exist\n", minor); > - error = -ENODEV; > - goto exit_err; > + kfree(reader); > + mutex_lock(&devices_lock); Typo. mutex_unlock() instead of mutex_lock(). > + return -ENODEV; > } > > + mutex_lock(&device->readers_lock); > + > if (!device->open++) { > /* power on device on adding first reader */ > error = hid_hw_power(device->hid, PM_HINT_FULLON); > regards, dan carpenter