From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>,
Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Bartosz Golaszewski <brgl@bgdev.pl>
Subject: [PATCH v2 1/7] gpio: mockup: improve the debugfs input sanitization
Date: Tue, 30 May 2017 10:58:34 +0200 [thread overview]
Message-ID: <1496134720-5363-2-git-send-email-brgl@bgdev.pl> (raw)
In-Reply-To: <1496134720-5363-1-git-send-email-brgl@bgdev.pl>
We're currently only checking the first character of the input to the
debugfs event files, so a string like '0sdfdsf' is valid and indicates
a falling edge event.
Be more strict and only allow '0', '1', '0\n' & '1\n'.
While we're at it: move the sanitization code before the irq_enabled
check so that we indicate an error on invalid input even if nobody is
waiting for events.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
drivers/gpio/gpio-mockup.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
index ba8d62a..da76267 100644
--- a/drivers/gpio/gpio-mockup.c
+++ b/drivers/gpio/gpio-mockup.c
@@ -208,8 +208,7 @@ static ssize_t gpio_mockup_event_write(struct file *file,
struct seq_file *sfile;
struct gpio_desc *desc;
struct gpio_chip *gc;
- int val;
- char buf;
+ int rv, val;
sfile = file->private_data;
priv = sfile->private;
@@ -217,19 +216,15 @@ static ssize_t gpio_mockup_event_write(struct file *file,
chip = priv->chip;
gc = &chip->gc;
+ rv = kstrtoint_from_user(usr_buf, size, 0, &val);
+ if (rv)
+ return rv;
+ if (val != 0 && val != 1)
+ return -EINVAL;
+
if (!chip->lines[priv->offset].irq_enabled)
return size;
- if (copy_from_user(&buf, usr_buf, 1))
- return -EFAULT;
-
- if (buf == '0')
- val = 0;
- else if (buf == '1')
- val = 1;
- else
- return -EINVAL;
-
gpiod_set_value_cansleep(desc, val);
priv->chip->irq_ctx.irq = gc->irq_base + priv->offset;
irq_work_queue(&priv->chip->irq_ctx.work);
--
2.9.3
next prev parent reply other threads:[~2017-05-30 8:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-30 8:58 [PATCH v2 0/7] gpio: mockup: updates for 4.13 Bartosz Golaszewski
2017-05-30 8:58 ` Bartosz Golaszewski [this message]
2017-05-30 18:52 ` [PATCH v2 1/7] gpio: mockup: improve the debugfs input sanitization Andy Shevchenko
2017-05-31 10:52 ` Bartosz Golaszewski
2017-05-31 17:58 ` Andy Shevchenko
2017-05-30 8:58 ` [PATCH v2 2/7] gpio: mockup: tweak gpio_mockup_event_write() Bartosz Golaszewski
2017-05-30 8:58 ` [PATCH v2 3/7] gpio: mockup: refuse to accept an odd number of GPIO ranges Bartosz Golaszewski
2017-05-30 8:58 ` [PATCH v2 4/7] gpio: mockup: improve readability Bartosz Golaszewski
2017-05-30 18:55 ` Andy Shevchenko
2017-05-31 10:53 ` Bartosz Golaszewski
2017-05-31 14:57 ` Andy Shevchenko
2017-05-31 15:06 ` Bartosz Golaszewski
2017-05-30 8:58 ` [PATCH v2 5/7] gpio: mockup: don't return magic numbers from probe() Bartosz Golaszewski
2017-05-30 8:58 ` [PATCH v2 6/7] gpio: mockup: improve the error message Bartosz Golaszewski
2017-05-30 18:59 ` Andy Shevchenko
2017-05-31 10:54 ` Bartosz Golaszewski
2017-05-31 15:00 ` Andy Shevchenko
2017-05-31 15:26 ` Bartosz Golaszewski
2017-06-01 7:14 ` Bartosz Golaszewski
2017-05-30 8:58 ` [PATCH v2 7/7] gpio: mockup: add myself as author Bartosz Golaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1496134720-5363-2-git-send-email-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=bamvor.zhangjian@linaro.org \
--cc=gnurou@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).