Re: [PATCH v4] drivers/hid: Check result of debugfs_create_dir() and debugfs_create_file()

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Jiri Kosina <jikos@kernel.org>
Newsgroups	linux.kernel
Subject	Re: [PATCH v4] drivers/hid: Check result of debugfs_create_dir() and debugfs_create_file()
Date	Wed, 23 Sep 2015 11:40:02 +0200
Message-ID	<qbOGS-bd-35@gated-at.bofh.it> (permalink)
References	<q4Zxq-3Iu-37@gated-at.bofh.it>
X-Original-To	Alexander Kuleshov <kuleshovmail@gmail.com>
X-X-Sender	jkosina@pobox.suse.cz
User-Agent	Alpine 2.00 (LNX 1167 2008-08-23)
MIME-Version	1.0
Content-Type	TEXT/PLAIN; charset=US-ASCII
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	70
Organization	linux.* mail to news gateway
X-Original-Cc	Henrik Rydberg <rydberg@bitmath.org>, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
X-Original-Date	Wed, 23 Sep 2015 11:30:30 +0200 (CEST)
X-Original-Message-ID	<alpine.LNX.2.00.1509231129180.30132@pobox.suse.cz>
X-Original-References	<1441374016-12804-1-git-send-email-kuleshovmail@gmail.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1231288

Show key headers only | View raw

On Fri, 4 Sep 2015, Alexander Kuleshov wrote:

> The debugfs_create_dir() and debugfs_create_file() functions may return -errno
> if an error occurs. This patch adds a couple of checks of the result of the
> debufs_create_dir() and debugfs_create_file() functions execution in the
> hid_debug_register() and othre places.
> 
> Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
> ---
> Changelog:
> 
> v4:
> 
>   * Syntax error fixed.
> 
> v3:
> 
>   * do not check hid_debug before the call of the hid_debug_init()
> and hid_debug_exit() from v2.
> 
> v2:
> 
>   * add check for the result of the debugfs_create_file() calls
>   * call hid_debug_init() and hid_debug_exit() only if hid_debug
>   * add check for the hid_debug_root in the hid_debug_register()
> 
>  drivers/hid/hid-core.c  |  9 ++++++---
>  drivers/hid/hid-debug.c | 34 +++++++++++++++++++++++++++++++++-
>  2 files changed, 39 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index e6fce23..fea2a88 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -2599,8 +2599,10 @@ int hid_add_device(struct hid_device *hdev)
>  	ret = device_add(&hdev->dev);
>  	if (!ret)
>  		hdev->status |= HID_STAT_ADDED;
> -	else
> -		hid_debug_unregister(hdev);
> +	else {
> +		if (hdev->debug)
> +			hid_debug_unregister(hdev);
> +	}
>  
>  	return ret;
>  }
> @@ -2644,7 +2646,8 @@ static void hid_remove_device(struct hid_device *hdev)
>  {
>  	if (hdev->status & HID_STAT_ADDED) {
>  		device_del(&hdev->dev);
> -		hid_debug_unregister(hdev);
> +		if (hdev->debug)
> +			hid_debug_unregister(hdev);

As we are sprinkling these checks around, and hid_debug_unregister() is a 
slow path anyway, I think I'll just rearrange the code that 
hid_debug_unregister() actually accepts NULL pointer.

Applied, thanks for the cleanup.

-- 
Jiri Kosina
SUSE Labs

--
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/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

Re: [PATCH v4] drivers/hid: Check result of debugfs_create_dir()  and debugfs_create_file() Jiri Kosina <jikos@kernel.org> - 2015-09-23 11:40 +0200

csiph-web