[v3,06/13] gpiolib: use gpiochip_get_desc() in gpio_ioctl()

Message ID	20191219171528.6348-7-brgl@bgdev.pl
State	New
Headers	show Return-Path: <linux-gpio-owner@vger.kernel.org> From: Bartosz Golaszewski <brgl@bgdev.pl> To: Kent Gibson <warthog618@gmail.com>, Linus Walleij <linus.walleij@linaro.org>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski <bgolaszewski@baylibre.com>, Andy Shevchenko <andy.shevchenko@gmail.com> Subject: [PATCH v3 06/13] gpiolib: use gpiochip_get_desc() in gpio_ioctl() Date: Thu, 19 Dec 2019 18:15:21 +0100 Message-Id: <20191219171528.6348-7-brgl@bgdev.pl> In-Reply-To: <20191219171528.6348-1-brgl@bgdev.pl> References: <20191219171528.6348-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk
Series	gpiolib: add an ioctl() for monitoring line status changes \| expand [v3,00/13] gpiolib: add an ioctl() for monitoring line status changes [v3,01/13] gpiolib: use 'unsigned int' instead of 'unsigned' in gpio_set_config() [v3,02/13] gpiolib: have a single place of calling set_config() [v3,03/13] gpiolib: convert the type of hwnum to unsigned int in gpiochip_get_desc() [v3,04/13] gpiolib: use gpiochip_get_desc() in linehandle_create() [v3,05/13] gpiolib: use gpiochip_get_desc() in lineevent_create() [v3,06/13] gpiolib: use gpiochip_get_desc() in gpio_ioctl() [v3,07/13] kfifo: provide noirqsave variants of spinlocked in and out helpers [v3,08/13] kfifo: provide kfifo_is_empty_spinlocked() [v3,09/13] gpiolib: rework the locking mechanism for lineevent kfifo [v3,10/13] gpiolib: emit a debug message when adding events to a full kfifo [v3,11/13] gpiolib: provide a dedicated function for setting lineinfo [v3,12/13] gpiolib: add new ioctl() for monitoring changes in line info [v3,13/13] tools: gpio: implement gpio-watch

Message ID

20191219171528.6348-7-brgl@bgdev.pl

State

New

Headers

From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Kent Gibson <warthog618@gmail.com>,
	Linus Walleij <linus.walleij@linaro.org>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>,
	Andy Shevchenko <andy.shevchenko@gmail.com>
Subject: [PATCH v3 06/13] gpiolib: use gpiochip_get_desc() in gpio_ioctl()
Date: Thu, 19 Dec 2019 18:15:21 +0100
Message-Id: <20191219171528.6348-7-brgl@bgdev.pl>
In-Reply-To: <20191219171528.6348-1-brgl@bgdev.pl>
References: <20191219171528.6348-1-brgl@bgdev.pl>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-gpio-owner@vger.kernel.org
Precedence: bulk

Series

gpiolib: add an ioctl() for monitoring line status changes | expand

Commit Message

Bartosz Golaszewski Dec. 19, 2019, 5:15 p.m. UTC

From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

Unduplicate the offset check by simply calling gpiochip_get_desc() and
checking its return value.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
 drivers/gpio/gpiolib.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 17796437d7be..b7043946c029 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1175,10 +1175,11 @@  static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 
 		if (copy_from_user(&lineinfo, ip, sizeof(lineinfo)))
 			return -EFAULT;
-		if (lineinfo.line_offset >= gdev->ngpio)
-			return -EINVAL;
 
-		desc = &gdev->descs[lineinfo.line_offset];
+		desc = gpiochip_get_desc(chip, lineinfo.line_offset);
+		if (IS_ERR(desc))
+			return PTR_ERR(desc);
+
 		if (desc->name) {
 			strncpy(lineinfo.name, desc->name,
 				sizeof(lineinfo.name));

[v3,06/13] gpiolib: use gpiochip_get_desc() in gpio_ioctl()

Commit Message

Patch