Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: /pYI1ZoLG7TMiPJEk7OoexsZC0C/R4B3PGmXwKj4rIOnD2D5H15gAd+DGbV8cE/JwMUK0eSaj1
 pAXRelGtjLcA==
IronPort-SDR: J6YrVZQkYKx+An4K5vDSlHfYFMiKMlVYAMS24LqhM5IAE+L/X8KC0+BQgEDuPhPz+Etyswjc4I
 8nMojLixL2/w==
From:   Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To:     Kent Gibson <warthog618@gmail.com>,
        Bartosz Golaszewski <bgolaszewski@baylibre.com>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Linus Walleij <linus.walleij@linaro.org>,
        Suresh Balakrishnan <suresh.balakrishnan@intel.com>
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>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

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 <suresh.balakrishnan@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 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;
 
-- 
2.30.2