Skip to contentSkip to conversation

Staging: silicom: use kstrtoint_from_user()

PATCH New Dan Carpenter 1 participant 1 message Sep 14, 2012

Subsystems (2)
Staging Kernel janitors
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 2/2 Staging: silicom: use kstrtoint_from_user()

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 <[email protected]>
drivers/staging/silicom/bp_mod.c +10 -22
index 1b3f5e7..f138d29 100644
@@ -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;