linux-gpio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 2/7] gpio: mockup: tweak gpio_mockup_event_write()
Date: Tue, 30 May 2017 10:58:35 +0200	[thread overview]
Message-ID: <1496134720-5363-3-git-send-email-brgl@bgdev.pl> (raw)
In-Reply-To: <1496134720-5363-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


  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 ` [PATCH v2 1/7] gpio: mockup: improve the debugfs input sanitization Bartosz Golaszewski
2017-05-30 18:52   ` Andy Shevchenko
2017-05-31 10:52     ` Bartosz Golaszewski
2017-05-31 17:58       ` Andy Shevchenko
2017-05-30  8:58 ` Bartosz Golaszewski [this message]
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-3-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).