| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 8 Feb 2011 12:06:00 +0100
From: Marek Belisko <marek.belisko@...n-nandra.com>
To: gregkh@...e.de
Cc: dilinger@...ued.net, cjb@...top.org, jon.nettleton@...il.com,
devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
Marek Belisko <marek.belisko@...n-nandra.com>
Subject: [PATCH RFC] staging: olpc_dcon: Remove _strtoul() function.
olpc_dcon driver use self invented _strtoul function
which make similar check like strict_strtoul just extend
for space checking at last string place. Normally access
to sys file looks echo 1024 > /sys/... so space could be considered
as error character and we could simplify code using just strict_strtoul
function instead self invented.
Signed-off-by: Marek Belisko <marek.belisko@...n-nandra.com>
---
drivers/staging/olpc_dcon/olpc_dcon.c | 66 ++++++++++++++------------------
1 files changed, 29 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index b19cd34..df1f664 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -521,49 +521,35 @@ static ssize_t dcon_resumeline_show(struct device *dev,
return sprintf(buf, "%d\n", resumeline);
}
-static int _strtoul(const char *buf, int len, unsigned int *val)
-{
-
- char *endp;
- unsigned int output = strict_strtoul(buf, &endp, 0);
- int size = endp - buf;
-
- if (*endp && isspace(*endp))
- size++;
-
- if (size != len)
- return -EINVAL;
-
- *val = output;
- return 0;
-}
-
static ssize_t dcon_output_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
- int output;
- int rc = -EINVAL;
+ unsigned long output;
+ int ret;
- if (_strtoul(buf, count, &output))
+ ret = strict_strtoul(buf, 10, &output);
+ if (ret)
+ return ret;
+
+ if ((output != DCON_OUTPUT_COLOR) && (output != DCON_OUTPUT_MONO))
return -EINVAL;
- if (output == DCON_OUTPUT_COLOR || output == DCON_OUTPUT_MONO) {
- dcon_set_output(output);
- rc = count;
- }
+ dcon_set_output(output);
- return rc;
+ return count;
}
static ssize_t dcon_freeze_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
- int output;
+ unsigned long output;
+ int ret;
- if (_strtoul(buf, count, &output))
- return -EINVAL;
+ ret = strict_strtoul(buf, 10, &output);
+ if (ret)
+ return ret;
- printk(KERN_INFO "dcon_freeze_store: %d\n", output);
+ printk(KERN_INFO "dcon_freeze_store: %lu\n", output);
switch (output) {
case 0:
@@ -585,28 +571,34 @@ static ssize_t dcon_freeze_store(struct device *dev,
static ssize_t dcon_resumeline_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
- int rl;
- int rc = -EINVAL;
+ unsigned long rl;
+ int ret;
- if (_strtoul(buf, count, &rl))
- return rc;
+ ret = strict_strtoul(buf, 10, &rl);
+ if (ret)
+ return ret;
resumeline = rl;
dcon_write(DCON_REG_SCAN_INT, resumeline);
- rc = count;
- return rc;
+ return count;
}
static ssize_t dcon_sleep_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
- int output;
+ unsigned long output;
+ int ret;
- if (_strtoul(buf, count, &output))
+ ret = strict_strtoul(buf, 10, &output);
+ if (ret)
+ return ret;
+
+ if (output != 0 && output != 1)
return -EINVAL;
dcon_sleep(output ? DCON_SLEEP : DCON_ACTIVE);
+
return count;
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists