Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1231288

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

Show all headers | 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