From patchwork Fri Sep 4 13:40:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kuleshov X-Patchwork-Id: 7123191 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 50D2CBEEC1 for ; Fri, 4 Sep 2015 13:41:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 780BD2089C for ; Fri, 4 Sep 2015 13:41:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76EDE207CE for ; Fri, 4 Sep 2015 13:41:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933028AbbIDNlZ (ORCPT ); Fri, 4 Sep 2015 09:41:25 -0400 Received: from mail-la0-f43.google.com ([209.85.215.43]:36437 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933172AbbIDNlW (ORCPT ); Fri, 4 Sep 2015 09:41:22 -0400 Received: by lanb10 with SMTP id b10so13595315lan.3; Fri, 04 Sep 2015 06:41:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=f+LC6+FNiZzBi1ncUOuZle3COzNcm0Nbf48kBxIsNsg=; b=o3LAFKGTD83dhnNE40dP1LHBoleJQ6qXO4LHxiwGeoIl1hhtXZiDoKLPQDdlIzc8QT AA3IXVBcTdH/pKH0UiMpLQAXruWvyIpqp6INQkIrF+S0hDbqH+r2M0pGn33MgcjB2h1x 7+NS8DVHVreAnltHEZu8ly+gQCCawhXxlJ1OUt4fPmCoFd8tESQX6ULrfHU3c9mGRloI cV6k+1V1LtHw6tvHhchjJtU5BApUQh3KDHOafHCG2nvRNvpzYR9xuS2e1V3GvaV6+k5k 038YjmQwLFPdHzUN02iVjySK/T72SADFxIxrSDAFTnmT6cx24p4NlZcG+VOCnfh7dlID p97w== X-Received: by 10.112.157.68 with SMTP id wk4mr3749668lbb.119.1441374081141; Fri, 04 Sep 2015 06:41:21 -0700 (PDT) Received: from localhost.localdomain ([37.151.210.18]) by smtp.gmail.com with ESMTPSA id qh3sm588061lbb.25.2015.09.04.06.41.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Sep 2015 06:41:20 -0700 (PDT) From: Alexander Kuleshov To: Jiri Kosina Cc: Henrik Rydberg , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Kuleshov Subject: [PATCH v4] drivers/hid: Check result of debugfs_create_dir() and debugfs_create_file() Date: Fri, 4 Sep 2015 19:40:16 +0600 Message-Id: <1441374016-12804-1-git-send-email-kuleshovmail@gmail.com> X-Mailer: git-send-email 2.5.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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); hdev->status &= ~HID_STAT_ADDED; } kfree(hdev->dev_rdesc); diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index 2886b64..12fe6b6 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c @@ -1222,12 +1222,41 @@ static const struct file_operations hid_debug_events_fops = { void hid_debug_register(struct hid_device *hdev, const char *name) { + if (!hid_debug_root) + goto debugfs_root_error; + hdev->debug_dir = debugfs_create_dir(name, hid_debug_root); + + if (!hdev->debug_dir) { + printk(KERN_WARNING "Could not create '%s' debugfs directory\n", + name); + return; + } + hdev->debug_rdesc = debugfs_create_file("rdesc", 0400, hdev->debug_dir, hdev, &hid_debug_rdesc_fops); + if (!hdev->debug_rdesc) { + printk(KERN_WARNING "Could not create rdesc debugfs file\n"); + goto error; + } + hdev->debug_events = debugfs_create_file("events", 0400, hdev->debug_dir, hdev, &hid_debug_events_fops); + if (!hdev->debug_events) { + printk(KERN_WARNING "Could not create events debugfs file\n"); + goto error; + } + hdev->debug = 1; + + return; + +error: + debugfs_remove_recursive(hdev->debug_dir); + return; + +debugfs_root_error: + return; } void hid_debug_unregister(struct hid_device *hdev) @@ -1242,10 +1271,13 @@ void hid_debug_unregister(struct hid_device *hdev) void hid_debug_init(void) { hid_debug_root = debugfs_create_dir("hid", NULL); + if (!hid_debug_root) + printk(KERN_WARNING "Could not create root 'hid' debugfs directory\n"); } void hid_debug_exit(void) { - debugfs_remove_recursive(hid_debug_root); + if (hid_debug_root) + debugfs_remove_recursive(hid_debug_root); }