From: Andreas Ruprecht <rupran@einserver.de>
To: devel@linuxdriverproject.org
Cc: gregkh@suse.de, jic23@cam.ac.uk, linux-iio@vger.kernel.org,
Andreas Ruprecht <rupran@einserver.de>
Subject: [PATCH 2/2] Staging: iio/accel: Added a range check for val in store_measurement_mode()
Date: Fri, 2 Dec 2011 17:30:23 +0100 [thread overview]
Message-ID: <1322843423-18178-2-git-send-email-rupran@einserver.de> (raw)
In-Reply-To: <1322843423-18178-1-git-send-email-rupran@einserver.de>
In sca3000_store_measurement_mode() we use val to and it with a mask.
This mask is only two bits long (as we are only interested in the
lowest two bits), so a value bigger than 3 was silently ignored so
far.
Now this function will return -EINVAL, if val is bigger than 3.
Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/accel/sca3000_core.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index a33e742..052005c 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -388,6 +388,10 @@ sca3000_store_measurement_mode(struct device *dev,
ret = kstrtou8(buf, 10, &val);
if (ret)
goto error_ret;
+ if (val > 3) {
+ ret = -EINVAL;
+ goto error_ret;
+ }
ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
if (ret)
goto error_ret;
--
1.7.5.4
next prev parent reply other threads:[~2011-12-02 16:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20111124205657.GL3258@mwanda>
2011-11-27 22:17 ` [PATCH 1/3] Staging: iio/accel: Changed data type in adis16220_write_16bit to u16 Andreas Ruprecht
2011-11-27 22:17 ` [PATCH 2/3] Staging: iio/accel: Changed data type for val to unsigned long in write_frequency Andreas Ruprecht
2011-12-01 21:08 ` Jonathan Cameron
2011-11-27 22:17 ` [PATCH 3/3] Staging: iio/accel: Changed data type of val in store_measurement_mode to u8 Andreas Ruprecht
2011-12-01 21:13 ` Jonathan Cameron
2011-12-02 16:30 ` [PATCH 1/2] Staging: iio/accel: Changed data type of mask in store_measurement_mode() " Andreas Ruprecht
2011-12-02 16:30 ` Andreas Ruprecht [this message]
2011-12-02 16:44 ` Alessandro Rubini
2011-12-02 16:56 ` [PATCH v2 " Andreas Ruprecht
2011-12-01 21:05 ` [PATCH 1/3] Staging: iio/accel: Changed data type in adis16220_write_16bit to u16 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=1322843423-18178-2-git-send-email-rupran@einserver.de \
--to=rupran@einserver.de \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@suse.de \
--cc=jic23@cam.ac.uk \
--cc=linux-iio@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).