From patchwork Tue May 18 15:50:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 442807 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 652F4C433B4 for ; Tue, 18 May 2021 15:50:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F55C6101E for ; Tue, 18 May 2021 15:50:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244861AbhERPvT (ORCPT ); Tue, 18 May 2021 11:51:19 -0400 Received: from mga11.intel.com ([192.55.52.93]:45895 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244533AbhERPvT (ORCPT ); Tue, 18 May 2021 11:51:19 -0400 IronPort-SDR: /pYI1ZoLG7TMiPJEk7OoexsZC0C/R4B3PGmXwKj4rIOnD2D5H15gAd+DGbV8cE/JwMUK0eSaj1 pAXRelGtjLcA== X-IronPort-AV: E=McAfee;i="6200,9189,9988"; a="197657331" X-IronPort-AV: E=Sophos;i="5.82,310,1613462400"; d="scan'208";a="197657331" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2021 08:50:00 -0700 IronPort-SDR: J6YrVZQkYKx+An4K5vDSlHfYFMiKMlVYAMS24LqhM5IAE+L/X8KC0+BQgEDuPhPz+Etyswjc4I 8nMojLixL2/w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,310,1613462400"; d="scan'208";a="411328265" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 18 May 2021 08:49:58 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id B15BF348; Tue, 18 May 2021 18:50:19 +0300 (EEST) From: Andy Shevchenko To: Kent Gibson , Bartosz Golaszewski , Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij , Suresh Balakrishnan Subject: [PATCH v1 1/2] gpiolib: Never return internal error codes to user space Date: Tue, 18 May 2021 18:50:12 +0300 Message-Id: <20210518155013.45622-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Currently it's possible that character device interface may return the error codes which are not supposed to be seen by user space. In this case it's EPROBE_DEFER. Wrap it to return -ENODEV instead as sysfs does. Fixes: d7c51b47ac11 ("gpio: userspace ABI for reading/writing GPIO lines") Fixes: 61f922db7221 ("gpio: userspace ABI for reading GPIO line events") Fixes: 3c0d9c635ae2 ("gpiolib: cdev: support GPIO_V2_GET_LINE_IOCTL and GPIO_V2_LINE_GET_VALUES_IOCTL") Reported-by: Suresh Balakrishnan Signed-off-by: Andy Shevchenko --- drivers/gpio/gpiolib-cdev.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c index 1631727bf0da..1d8f66880d63 100644 --- a/drivers/gpio/gpiolib-cdev.c +++ b/drivers/gpio/gpiolib-cdev.c @@ -331,8 +331,11 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip) } ret = gpiod_request(desc, lh->label); - if (ret) + if (ret) { + if (ret == -EPROBE_DEFER) + ret = -ENODEV; goto out_free_lh; + } lh->descs[i] = desc; linehandle_flags_to_desc_flags(handlereq.flags, &desc->flags); @@ -1379,8 +1382,11 @@ static int linereq_create(struct gpio_device *gdev, void __user *ip) } ret = gpiod_request(desc, lr->label); - if (ret) + if (ret) { + if (ret == -EPROBE_DEFER) + ret = -ENODEV; goto out_free_linereq; + } lr->lines[i].desc = desc; flags = gpio_v2_line_config_flags(lc, i); @@ -1765,8 +1771,11 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip) } ret = gpiod_request(desc, le->label); - if (ret) + if (ret) { + if (ret == -EPROBE_DEFER) + ret = -ENODEV; goto out_free_le; + } le->desc = desc; le->eflags = eflags; From patchwork Tue May 18 15:50:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 441477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA368C43460 for ; Tue, 18 May 2021 15:50:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA30F6113C for ; Tue, 18 May 2021 15:50:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345951AbhERPvV (ORCPT ); Tue, 18 May 2021 11:51:21 -0400 Received: from mga11.intel.com ([192.55.52.93]:45895 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240361AbhERPvU (ORCPT ); Tue, 18 May 2021 11:51:20 -0400 IronPort-SDR: yGzgACAx1xS3+M6KIwUZWrUBoutGsHQY9BNdiqT+fXMM3hqt0VXswBFxQKjy7XW/0d3RXrJ/iu SQB9IO2JNcJQ== X-IronPort-AV: E=McAfee;i="6200,9189,9988"; a="197657334" X-IronPort-AV: E=Sophos;i="5.82,310,1613462400"; d="scan'208";a="197657334" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2021 08:50:01 -0700 IronPort-SDR: fbd72Sc3wSKHE5OFTWe1UWU5h5glrGatWwUc3NlZjyK7XSwj3JnGnGvIpuhI6ovC74ZAkCtjcq nPOUQPjvd35w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,310,1613462400"; d="scan'208";a="411328261" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 18 May 2021 08:49:59 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 1486750E; Tue, 18 May 2021 18:50:21 +0300 (EEST) From: Andy Shevchenko To: Kent Gibson , Bartosz Golaszewski , Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij Subject: [PATCH v1 2/2] gpiolib: Introduce gpiod_request_user() helper Date: Tue, 18 May 2021 18:50:13 +0300 Message-Id: <20210518155013.45622-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210518155013.45622-1-andriy.shevchenko@linux.intel.com> References: <20210518155013.45622-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The gpiod_request_user() is a special helper to avoid propagating stuff to user space that should not be propagated, e.g. internal error codes. For now, hide EPROBE_DEFER with ENODEV. Signed-off-by: Andy Shevchenko Reviewed-by: Linus Walleij --- drivers/gpio/gpiolib-cdev.c | 21 ++++++--------------- drivers/gpio/gpiolib-sysfs.c | 7 ++----- drivers/gpio/gpiolib.h | 12 ++++++++++++ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c index 1d8f66880d63..8a934914f93a 100644 --- a/drivers/gpio/gpiolib-cdev.c +++ b/drivers/gpio/gpiolib-cdev.c @@ -330,12 +330,9 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip) goto out_free_lh; } - ret = gpiod_request(desc, lh->label); - if (ret) { - if (ret == -EPROBE_DEFER) - ret = -ENODEV; + ret = gpiod_request_user(desc, lh->label); + if (ret) goto out_free_lh; - } lh->descs[i] = desc; linehandle_flags_to_desc_flags(handlereq.flags, &desc->flags); @@ -1381,12 +1378,9 @@ static int linereq_create(struct gpio_device *gdev, void __user *ip) goto out_free_linereq; } - ret = gpiod_request(desc, lr->label); - if (ret) { - if (ret == -EPROBE_DEFER) - ret = -ENODEV; + ret = gpiod_request_user(desc, lr->label); + if (ret) goto out_free_linereq; - } lr->lines[i].desc = desc; flags = gpio_v2_line_config_flags(lc, i); @@ -1770,12 +1764,9 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip) } } - ret = gpiod_request(desc, le->label); - if (ret) { - if (ret == -EPROBE_DEFER) - ret = -ENODEV; + ret = gpiod_request_user(desc, le->label); + if (ret) goto out_free_le; - } le->desc = desc; le->eflags = eflags; diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index d836aba91d3c..22a9ad1a2978 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c @@ -473,12 +473,9 @@ static ssize_t export_store(struct class *class, * they may be undone on its behalf too. */ - status = gpiod_request(desc, "sysfs"); - if (status) { - if (status == -EPROBE_DEFER) - status = -ENODEV; + status = gpiod_request_user(desc, "sysfs"); + if (status) goto done; - } status = gpiod_set_transitory(desc, false); if (!status) { diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h index 69c96a4276de..7f760745c457 100644 --- a/drivers/gpio/gpiolib.h +++ b/drivers/gpio/gpiolib.h @@ -142,6 +142,18 @@ struct gpio_desc { int gpiod_request(struct gpio_desc *desc, const char *label); void gpiod_free(struct gpio_desc *desc); + +static inline int gpiod_request_user(struct gpio_desc *desc, const char *label) +{ + int ret; + + ret = gpiod_request(desc, label); + if (ret == -EPROBE_DEFER) + ret = -ENODEV; + + return ret; +} + int gpiod_configure_flags(struct gpio_desc *desc, const char *con_id, unsigned long lflags, enum gpiod_flags dflags); int gpio_set_debounce_timeout(struct gpio_desc *desc, unsigned int debounce);