mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Brian Masney <masneyb@onstation.org>
To: jic23@kernel.org, linux-iio@vger.kernel.org
Cc: devel@driverdev.osuosl.org, lars@metafoo.de,
	gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
	pmeerw@pmeerw.net, knaack.h@gmx.de, drew.paterson@ams.com
Subject: [PATCH v2 02/11] staging: iio: tsl2x7x: add range checking to three sysfs attributes
Date: Thu,  3 May 2018 22:53:10 -0400	[thread overview]
Message-ID: <20180504025319.28953-3-masneyb@onstation.org> (raw)
In-Reply-To: <20180504025319.28953-1-masneyb@onstation.org>

The sysfs attributes in_illuminance0_target_input,
in_illuminance0_calibrate, and in_proximity0_calibrate did not have
proper range checking in place so this patch adds the correct range
checks.

Signed-off-by: Brian Masney <masneyb@onstation.org>
---
 drivers/staging/iio/light/tsl2x7x.c | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c
index 01bff4593640..b4d77f65ca12 100644
--- a/drivers/staging/iio/light/tsl2x7x.c
+++ b/drivers/staging/iio/light/tsl2x7x.c
@@ -814,15 +814,13 @@ static ssize_t in_illuminance0_target_input_store(struct device *dev,
 {
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct tsl2X7X_chip *chip = iio_priv(indio_dev);
-	unsigned long value;
+	u16 value;
 	int ret;
 
-	if (kstrtoul(buf, 0, &value))
+	if (kstrtou16(buf, 0, &value))
 		return -EINVAL;
 
-	if (value)
-		chip->settings.als_cal_target = value;
-
+	chip->settings.als_cal_target = value;
 	ret = tsl2x7x_invoke_change(indio_dev);
 	if (ret < 0)
 		return ret;
@@ -838,14 +836,12 @@ static ssize_t in_illuminance0_calibrate_store(struct device *dev,
 	bool value;
 	int ret;
 
-	if (strtobool(buf, &value))
+	if (kstrtobool(buf, &value) || !value)
 		return -EINVAL;
 
-	if (value) {
-		ret = tsl2x7x_als_calibrate(indio_dev);
-		if (ret < 0)
-			return ret;
-	}
+	ret = tsl2x7x_als_calibrate(indio_dev);
+	if (ret < 0)
+		return ret;
 
 	ret = tsl2x7x_invoke_change(indio_dev);
 	if (ret < 0)
@@ -932,14 +928,12 @@ static ssize_t in_proximity0_calibrate_store(struct device *dev,
 	bool value;
 	int ret;
 
-	if (strtobool(buf, &value))
+	if (kstrtobool(buf, &value) || !value)
 		return -EINVAL;
 
-	if (value) {
-		ret = tsl2x7x_prox_cal(indio_dev);
-		if (ret < 0)
-			return ret;
-	}
+	ret = tsl2x7x_prox_cal(indio_dev);
+	if (ret < 0)
+		return ret;
 
 	ret = tsl2x7x_invoke_change(indio_dev);
 	if (ret < 0)
-- 
2.14.3

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

  parent reply	other threads:[~2018-05-04  2:53 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-04  2:53 [PATCH v2 00/11] staging: iio: tsl2x7x: move out of staging Brian Masney
2018-05-04  2:53 ` [PATCH v2 01/11] staging: iio: tsl2x7x: use GPL-2.0+ SPDX license identifier Brian Masney
2018-05-06 17:59   ` Jonathan Cameron
2018-05-04  2:53 ` Brian Masney [this message]
2018-05-06 18:01   ` [PATCH v2 02/11] staging: iio: tsl2x7x: add range checking to three sysfs attributes Jonathan Cameron
2018-05-04  2:53 ` [PATCH v2 03/11] staging: iio: tsl2x7x: don't setup event handlers if interrupts are not configured Brian Masney
2018-05-06 18:05   ` Jonathan Cameron
2018-05-04  2:53 ` [PATCH v2 04/11] staging: iio: tsl2x7x: move calibscale_available attribute to IIO_INTENSITY channel Brian Masney
2018-05-06 18:06   ` Jonathan Cameron
2018-05-04  2:53 ` [PATCH v2 05/11] staging: iio: tsl2x7x: use IIO_CONST_ATTR for calibscale_available Brian Masney
2018-05-06 18:07   ` Jonathan Cameron
2018-05-04  2:53 ` [PATCH v2 06/11] staging: iio: tsl2x7x: correct integration time and lux equation Brian Masney
2018-05-06 18:11   ` Jonathan Cameron
2018-05-04  2:53 ` [PATCH v2 07/11] staging: iio: tsl2x7x: support 2.72 and 2.73 ALS increments Brian Masney
2018-05-06 18:19   ` Jonathan Cameron
2018-05-04  2:53 ` [PATCH v2 08/11] staging: iio: tsl2x7x: add device ids for code readability Brian Masney
2018-05-06 18:26   ` Jonathan Cameron
2018-05-04  2:53 ` [PATCH v2 09/11] staging: iio: tsl2x7x: correct IIO_EV_INFO_PERIOD values Brian Masney
2018-05-06 18:27   ` Jonathan Cameron
2018-05-04  2:53 ` [PATCH v2 10/11] staging: iio: tsl2x7x: rename driver to tsl2772 Brian Masney
2018-05-06 18:29   ` Jonathan Cameron
2018-05-04  2:53 ` [PATCH v2 11/11] staging: iio: tsl2x7x/tsl2772: move out of staging Brian Masney
2018-05-04  2:56   ` Brian Masney
2018-05-06 19:00     ` Jonathan Cameron

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=20180504025319.28953-3-masneyb@onstation.org \
    --to=masneyb@onstation.org \
    --cc=devel@driverdev.osuosl.org \
    --cc=drew.paterson@ams.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    /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
all inboxes | Powered by JetHome®