X86 platform drivers
 help / color / mirror / Atom feed
From: Azael Avalos <coproscefalo@gmail.com>
To: Matthew Garrett <matthew.garrett@nebula.com>,
	Darren Hart <dvhart@infradead.org>,
	platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: Azael Avalos <coproscefalo@gmail.com>
Subject: [PATCH 5/5] toshiba_acpi: Change touchpad store to check for invalid values
Date: Fri,  5 Sep 2014 11:14:07 -0600	[thread overview]
Message-ID: <1409937247-2525-6-git-send-email-coproscefalo@gmail.com> (raw)
In-Reply-To: <1409937247-2525-1-git-send-email-coproscefalo@gmail.com>

The function toshiba_touchpad_store is not checking
for invalid values and simply returns silently.

This patch checks for invalid values and returns accordingly.

Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
---
 drivers/platform/x86/toshiba_acpi.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 1738171..777fb3c 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -1396,12 +1396,18 @@ static ssize_t toshiba_touchpad_store(struct device *dev,
 {
 	struct toshiba_acpi_dev *toshiba = dev_get_drvdata(dev);
 	int state;
+	int ret;
 
 	/* Set the TouchPad on/off, 0 - Disable | 1 - Enable */
-	if (sscanf(buf, "%i", &state) == 1 && (state == 0 || state == 1)) {
-		if (toshiba_touchpad_set(toshiba, state) < 0)
-			return -EIO;
-	}
+	ret = kstrtoint(buf, 0, &state);
+	if (ret)
+		return ret;
+	if (state != 0 || state != 1)
+		return -EINVAL;
+
+	ret = toshiba_touchpad_set(toshiba, state);
+	if (ret)
+		return ret;
 
 	return count;
 }
-- 
2.0.0

  parent reply	other threads:[~2014-09-05 17:14 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-05 17:14 [PATCH 0/5] toshiba_acpi: Various changes plus fixes Azael Avalos
2014-09-05 17:14 ` [PATCH 1/5] toshiba_acpi: Additional hotkey scancodes Azael Avalos
2014-09-09  0:12   ` Darren Hart
2014-09-05 17:14 ` [PATCH 2/5] toshiba_acpi: Fix illumination not available on certain models Azael Avalos
2014-09-06  2:35   ` Darren Hart
2014-09-06  4:49     ` Azael Avalos
2014-09-09  0:09       ` Darren Hart
2014-09-05 17:14 ` [PATCH 3/5] toshiba_acpi: Add accelerometer input polled device Azael Avalos
2014-09-06  2:42   ` Darren Hart
2014-09-06  5:04     ` Azael Avalos
     [not found]       ` <CAGdLNWGhdQU3Fpud9Zgvx3AQ5Lb=WdEkJb_wWTb1hJoHxXPXpQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-09-09  0:04         ` Darren Hart
2014-09-09  1:35           ` Greg Kroah-Hartman
2014-09-10  3:35             ` Darren Hart
2014-09-10 15:28               ` Azael Avalos
     [not found]                 ` <CAGdLNWEgJmNQ_F7kozn4tGCq_AseuE95xHKoxTWgtNqdBwSm5A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-09-10 16:08                   ` Greg Kroah-Hartman
2014-09-17 16:36           ` Jonathan Cameron
2014-09-17 18:38             ` Darren Hart
2014-09-05 17:14 ` [PATCH 4/5] toshiba_acpi: Support new keyboard backlight type Azael Avalos
2014-09-10  4:11   ` Darren Hart
2014-09-10 16:52     ` Azael Avalos
2014-09-10 18:34       ` Darren Hart
2014-09-05 17:14 ` Azael Avalos [this message]
2014-09-10  4:17   ` [PATCH 5/5] toshiba_acpi: Change touchpad store to check for invalid values Darren Hart

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=1409937247-2525-6-git-send-email-coproscefalo@gmail.com \
    --to=coproscefalo@gmail.com \
    --cc=dvhart@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matthew.garrett@nebula.com \
    --cc=platform-driver-x86@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