linux-kernel - [PATCH] gpiolib: fix compiling when CONFIG_GPIO_CDEV

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Fri,  2 Dec 2022 15:04:54 +0100
From:   Nick Hainke <vincent@...temli.org>
To:     vincent@...temli.org
Cc:     linux-next@...r.kernel.org,
        Linus Walleij <linus.walleij@...aro.org>,
        Bartosz Golaszewski <brgl@...ev.pl>,
        Kent Gibson <warthog618@...il.com>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        linux-gpio@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] gpiolib: fix compiling when CONFIG_GPIO_CDEV_V1 is not defined

If CONFIG_GPIO_CDEV_V1 is not defined compiling will fail with:

drivers/gpio/gpiolib-cdev.c: In function 'linereq_ioctl':
drivers/gpio/gpiolib-cdev.c:1468:16: error: implicit declaration of
 function 'call_ioctl_locked' [-Werror=implicit-function-declaration]
 1468 |         return call_ioctl_locked(file, cmd, arg, lr->gdev,
      |                ^~~~~~~~~~~~~~~~~
drivers/gpio/gpiolib-cdev.c: In function 'linereq_poll':
drivers/gpio/gpiolib-cdev.c:1503:16: error: implicit declaration of
 function 'call_poll_locked'; did you mean 'wake_up_all_locked'?
 [-Werror=implicit-function-declaration]
 1503 |         return call_poll_locked(file, wait, lr->gdev,
                                      linereq_poll_unlocked);
      |                ^~~~~~~~~~~~~~~~
      |                wake_up_all_locked
drivers/gpio/gpiolib-cdev.c: In function 'linereq_read':
drivers/gpio/gpiolib-cdev.c:1566:16: error: implicit declaration of
 function 'call_read_locked'; did you mean 'xa_head_locked'?
 [-Werror=implicit-function-declaration]
 1566 |         return call_read_locked(file, buf, count, f_ps, lr->gdev,
      |                ^~~~~~~~~~~~~~~~
      |                xa_head_locked

Move "call_poll_locked", "call_ioctl_locked", "call_read_locked" and
the necessary typedefs "poll_fn", "ioctl_fn", "read_fn" in front of the
ifdef-statement checking CONFIG_GPIO_CDEV_V1.

Fixes: 98d8b93c6171 ("gpiolib: protect the GPIO device against being dropped while in use by user-space")

Signed-off-by: Nick Hainke <vincent@...temli.org>
---
 drivers/gpio/gpiolib-cdev.c | 50 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
index e8079c1d2e1b..067e26a00775 100644
--- a/drivers/gpio/gpiolib-cdev.c
+++ b/drivers/gpio/gpiolib-cdev.c
@@ -61,31 +61,6 @@ static_assert(IS_ALIGNED(sizeof(struct gpio_v2_line_values), 8));
  * GPIO line handle management
  */
 
-#ifdef CONFIG_GPIO_CDEV_V1
-/**
- * struct linehandle_state - contains the state of a userspace handle
- * @gdev: the GPIO device the handle pertains to
- * @label: consumer label used to tag descriptors
- * @descs: the GPIO descriptors held by this handle
- * @num_descs: the number of descriptors held in the descs array
- */
-struct linehandle_state {
-	struct gpio_device *gdev;
-	const char *label;
-	struct gpio_desc *descs[GPIOHANDLES_MAX];
-	u32 num_descs;
-};
-
-#define GPIOHANDLE_REQUEST_VALID_FLAGS \
-	(GPIOHANDLE_REQUEST_INPUT | \
-	GPIOHANDLE_REQUEST_OUTPUT | \
-	GPIOHANDLE_REQUEST_ACTIVE_LOW | \
-	GPIOHANDLE_REQUEST_BIAS_PULL_UP | \
-	GPIOHANDLE_REQUEST_BIAS_PULL_DOWN | \
-	GPIOHANDLE_REQUEST_BIAS_DISABLE | \
-	GPIOHANDLE_REQUEST_OPEN_DRAIN | \
-	GPIOHANDLE_REQUEST_OPEN_SOURCE)
-
 typedef __poll_t (*poll_fn)(struct file *, struct poll_table_struct *);
 typedef long (*ioctl_fn)(struct file *, unsigned int, unsigned long);
 typedef ssize_t (*read_fn)(struct file *, char __user *,
@@ -133,6 +108,31 @@ static ssize_t call_read_locked(struct file *file, char __user *buf,
 	return ret;
 }
 
+#ifdef CONFIG_GPIO_CDEV_V1
+/**
+ * struct linehandle_state - contains the state of a userspace handle
+ * @gdev: the GPIO device the handle pertains to
+ * @label: consumer label used to tag descriptors
+ * @descs: the GPIO descriptors held by this handle
+ * @num_descs: the number of descriptors held in the descs array
+ */
+struct linehandle_state {
+	struct gpio_device *gdev;
+	const char *label;
+	struct gpio_desc *descs[GPIOHANDLES_MAX];
+	u32 num_descs;
+};
+
+#define GPIOHANDLE_REQUEST_VALID_FLAGS \
+	(GPIOHANDLE_REQUEST_INPUT | \
+	GPIOHANDLE_REQUEST_OUTPUT | \
+	GPIOHANDLE_REQUEST_ACTIVE_LOW | \
+	GPIOHANDLE_REQUEST_BIAS_PULL_UP | \
+	GPIOHANDLE_REQUEST_BIAS_PULL_DOWN | \
+	GPIOHANDLE_REQUEST_BIAS_DISABLE | \
+	GPIOHANDLE_REQUEST_OPEN_DRAIN | \
+	GPIOHANDLE_REQUEST_OPEN_SOURCE)
+
 static int linehandle_validate_flags(u32 flags)
 {
 	/* Return an error if an unknown flag is set */
-- 
2.38.1