[PATCH] [BUGFIX] gpio: reject invalid gpio before getting gpio_desc
From: Masami Hiramatsu
Date: Sat Jul 29 2017 - 04:01:52 EST
Check user-given gpio number and reject it before
calling gpio_to_desc() because gpio_to_desc() is
for kernel driver and it expects given gpio number
is valid (means 0 to 511).
If given number is invalid, gpio_to_desc() calls
WARN() and dump registers and stack for debug.
This means user can easily kick WARN() just by
writing invalid gpio number (e.g. 512) to
/sys/class/gpio/export.
This bug has been introduced by commit 0e9a5edf5d01
("gpio: fix deferred probe detection for legacy API")
Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Fixes: commit 0e9a5edf5d01 ("gpio: fix deferred probe detection for legacy API")
---
drivers/gpio/gpiolib-sysfs.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c
index 4b44dd97c07f..4efb11fd1c22 100644
--- a/drivers/gpio/gpiolib-sysfs.c
+++ b/drivers/gpio/gpiolib-sysfs.c
@@ -2,6 +2,7 @@
#include <linux/mutex.h>
#include <linux/device.h>
#include <linux/sysfs.h>
+#include <linux/gpio.h>
#include <linux/gpio/consumer.h>
#include <linux/gpio/driver.h>
#include <linux/interrupt.h>
@@ -443,14 +444,16 @@ static ssize_t export_store(struct class *class,
const char *buf, size_t len)
{
long gpio;
- struct gpio_desc *desc;
+ struct gpio_desc *desc = NULL;
int status;
status = kstrtol(buf, 0, &gpio);
if (status < 0)
goto done;
- desc = gpio_to_desc(gpio);
+ if (gpio_is_valid(gpio))
+ desc = gpio_to_desc(gpio);
+
/* reject invalid GPIOs */
if (!desc) {
pr_warn("%s: invalid GPIO %ld\n", __func__, gpio);
@@ -485,14 +488,16 @@ static ssize_t unexport_store(struct class *class,
const char *buf, size_t len)
{
long gpio;
- struct gpio_desc *desc;
+ struct gpio_desc *desc = NULL;
int status;
status = kstrtol(buf, 0, &gpio);
if (status < 0)
goto done;
- desc = gpio_to_desc(gpio);
+ if (gpio_is_valid(gpio))
+ desc = gpio_to_desc(gpio);
+
/* reject bogus commands (gpio_unexport ignores them) */
if (!desc) {
pr_warn("%s: invalid GPIO %ld\n", __func__, gpio);