* [patch 2/2] Staging: silicom: use kstrtoint_from_user()
@ 2012-09-14 8:11 Dan Carpenter
0 siblings, 0 replies; only message in thread
From: Dan Carpenter @ 2012-09-14 8:11 UTC (permalink / raw)
To: kernel-janitors
The main problem with the hand rolled code was that there weren't any
range checks so you could corrupt memory by writing too much data to
the proc file.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/staging/silicom/bp_mod.c b/drivers/staging/silicom/bp_mod.c
index 1b3f5e7..f138d29 100644
--- a/drivers/staging/silicom/bp_mod.c
+++ b/drivers/staging/silicom/bp_mod.c
@@ -8071,20 +8071,13 @@ int
set_bypass_wd_pfs(struct file *file, const char *buffer,
unsigned long count, void *data)
{
-
- char kbuf[256];
bpctl_dev_t *pbp_device_block = (bpctl_dev_t *) data;
+ int timeout;
+ int ret;
- unsigned int timeout = 0;
- char *timeout_ptr = kbuf;
-
- if (copy_from_user(&kbuf, buffer, count)) {
- return -1;
- }
-
- timeout_ptr = kbuf;
- timeout = atoi(&timeout_ptr);
-
+ ret = kstrtoint_from_user(buffer, count, 10, &timeout);
+ if (ret)
+ return ret;
set_bypass_wd_fn(pbp_device_block, timeout);
return count;
@@ -8712,18 +8705,13 @@ int
set_wd_autoreset_pfs(struct file *file, const char *buffer,
unsigned long count, void *data)
{
- char kbuf[256];
bpctl_dev_t *pbp_device_block = (bpctl_dev_t *) data;
- u32 timeout = 0;
- char *timeout_ptr = kbuf;
-
- if (copy_from_user(&kbuf, buffer, count)) {
- return -1;
- }
-
- timeout_ptr = kbuf;
- timeout = atoi(&timeout_ptr);
+ int timeout;
+ int ret;
+ ret = kstrtoint_from_user(buffer, count, 10, &timeout);
+ if (ret)
+ return ret;
set_wd_autoreset_fn(pbp_device_block, timeout);
return count;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-09-14 8:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-14 8:11 [patch 2/2] Staging: silicom: use kstrtoint_from_user() Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox