From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Andy Shevchenko <andy.shevchenko@gmail.com>,
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 v3 2/8] gpio: mockup: tweak gpio_mockup_event_write()
Date: Fri, 9 Jun 2017 13:41:26 +0200 [thread overview]
Message-ID: <1497008492-14907-3-git-send-email-brgl@bgdev.pl> (raw)
In-Reply-To: <1497008492-14907-1-git-send-email-brgl@bgdev.pl>
Invert the logic of the irq_enabled check and only access the private
data after the input is sanitized.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
drivers/gpio/gpio-mockup.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
index da76267..d78e8e0 100644
--- a/drivers/gpio/gpio-mockup.c
+++ b/drivers/gpio/gpio-mockup.c
@@ -210,24 +210,23 @@ static ssize_t gpio_mockup_event_write(struct file *file,
struct gpio_chip *gc;
int rv, val;
- sfile = file->private_data;
- priv = sfile->private;
- desc = priv->desc;
- 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;
+ sfile = file->private_data;
+ priv = sfile->private;
+ desc = priv->desc;
+ chip = priv->chip;
+ gc = &chip->gc;
- gpiod_set_value_cansleep(desc, val);
- priv->chip->irq_ctx.irq = gc->irq_base + priv->offset;
- irq_work_queue(&priv->chip->irq_ctx.work);
+ if (chip->lines[priv->offset].irq_enabled) {
+ gpiod_set_value_cansleep(desc, val);
+ priv->chip->irq_ctx.irq = gc->irq_base + priv->offset;
+ irq_work_queue(&priv->chip->irq_ctx.work);
+ }
return size;
}
--
2.9.3
next prev parent reply other threads:[~2017-06-09 11:41 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 11:41 [PATCH v3 0/8] gpio: mockup: updates for 4.13 Bartosz Golaszewski
2017-06-09 11:41 ` [PATCH v3 1/8] gpio: mockup: improve the debugfs input sanitization Bartosz Golaszewski
2017-06-20 7:12 ` Linus Walleij
2017-06-09 11:41 ` Bartosz Golaszewski [this message]
2017-06-20 7:13 ` [PATCH v3 2/8] gpio: mockup: tweak gpio_mockup_event_write() Linus Walleij
2017-06-09 11:41 ` [PATCH v3 3/8] gpio: mockup: refuse to accept an odd number of GPIO ranges Bartosz Golaszewski
2017-06-20 7:14 ` Linus Walleij
2017-06-09 11:41 ` [PATCH v3 4/8] gpio: mockup: improve readability Bartosz Golaszewski
2017-06-20 7:14 ` Linus Walleij
2017-06-09 11:41 ` [PATCH v3 5/8] gpio: mockup: don't return magic numbers from probe() Bartosz Golaszewski
2017-06-20 7:15 ` Linus Walleij
2017-06-09 11:41 ` [PATCH v3 6/8] gpio: mockup: improve the error message Bartosz Golaszewski
2017-06-20 7:16 ` Linus Walleij
2017-06-09 11:41 ` [PATCH v3 7/8] gpio: mockup: add myself as author Bartosz Golaszewski
2017-06-20 7:17 ` Linus Walleij
2017-06-09 11:41 ` [PATCH v3 8/8] gpio: mockup: use devm_kcalloc() where applicable Bartosz Golaszewski
2017-06-20 7:17 ` Linus Walleij
2017-06-09 15:46 ` [PATCH v3 0/8] gpio: mockup: updates for 4.13 Andy Shevchenko
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=1497008492-14907-3-git-send-email-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andy.shevchenko@gmail.com \
--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