mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tracing: Convert to kstrtoul_from_user

Browse source 
This patch replaces the code for getting an unsigned long from a
userspace buffer by a simple call to kstroul_from_user.
This makes it easier to read and less error prone.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Link: http://lkml.kernel.org/r/1307476707-14762-1-git-send-email-peterhuewe@gmx.de
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Peter Huewe 2011-06-07 21:58:27 +02:00 committed by Steven Rostedt
parent 749230b06a
commit 22fe9b54d8
5 changed files with 20 additions and 110 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

13
kernel/trace/ftrace.c
View file

@ -803,19 +803,10 @@ ftrace_profile_write(struct file *filp, const char __user *ubuf,
size_t cnt, loff_t *ppos) size_t cnt, loff_t *ppos)
{ {
unsigned long val; unsigned long val;
char buf[64]; /* big enough to hold a number */
int ret; int ret;
if (cnt >= sizeof(buf)) ret = kstrtoul_from_user(ubuf, cnt, 10, &val);
return -EINVAL; if (ret)
if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT;
buf[cnt] = 0;
ret = strict_strtoul(buf, 10, &val);
if (ret < 0)
return ret; return ret;
val = !!val; val = !!val;

13
kernel/trace/ring_buffer.c
View file

@ -3980,20 +3980,11 @@ rb_simple_write(struct file *filp, const char __user *ubuf,
size_t cnt, loff_t *ppos) size_t cnt, loff_t *ppos)
{ {
unsigned long *p = filp->private_data; unsigned long *p = filp->private_data;
char buf[64];
unsigned long val; unsigned long val;
int ret; int ret;
if (cnt >= sizeof(buf)) ret = kstrtoul_from_user(ubuf, cnt, 10, &val);
return -EINVAL; if (ret)
if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT;
buf[cnt] = 0;
ret = strict_strtoul(buf, 10, &val);
if (ret < 0)
return ret; return ret;
if (val) if (val)

65
kernel/trace/trace.c
View file

@ -2706,20 +2706,11 @@ tracing_ctrl_write(struct file *filp, const char __user *ubuf,
size_t cnt, loff_t *ppos) size_t cnt, loff_t *ppos)
{ {
struct trace_array *tr = filp->private_data; struct trace_array *tr = filp->private_data;
char buf[64];
unsigned long val; unsigned long val;
int ret; int ret;
if (cnt >= sizeof(buf)) ret = kstrtoul_from_user(ubuf, cnt, 10, &val);
return -EINVAL; if (ret)
if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT;
buf[cnt] = 0;
ret = strict_strtoul(buf, 10, &val);
if (ret < 0)
return ret; return ret;
val = !!val; val = !!val;
@ -3006,20 +2997,11 @@ tracing_max_lat_write(struct file *filp, const char __user *ubuf,
size_t cnt, loff_t *ppos) size_t cnt, loff_t *ppos)
{ {
unsigned long *ptr = filp->private_data; unsigned long *ptr = filp->private_data;
char buf[64];
unsigned long val; unsigned long val;
int ret; int ret;
if (cnt >= sizeof(buf)) ret = kstrtoul_from_user(ubuf, cnt, 10, &val);
return -EINVAL; if (ret)
if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT;
buf[cnt] = 0;
ret = strict_strtoul(buf, 10, &val);
if (ret < 0)
return ret; return ret;
*ptr = val * 1000; *ptr = val * 1000;
@ -3474,19 +3456,10 @@ tracing_entries_write(struct file *filp, const char __user *ubuf,
size_t cnt, loff_t *ppos) size_t cnt, loff_t *ppos)
{ {
unsigned long val; unsigned long val;
char buf[64];
int ret; int ret;
if (cnt >= sizeof(buf)) ret = kstrtoul_from_user(ubuf, cnt, 10, &val);
return -EINVAL; if (ret)
if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT;
buf[cnt] = 0;
ret = strict_strtoul(buf, 10, &val);
if (ret < 0)
return ret; return ret;
/* must have at least 1 entry */ /* must have at least 1 entry */
@ -4139,19 +4112,10 @@ trace_options_write(struct file *filp, const char __user *ubuf, size_t cnt,
{ {
struct trace_option_dentry *topt = filp->private_data; struct trace_option_dentry *topt = filp->private_data;
unsigned long val; unsigned long val;
char buf[64];
int ret; int ret;
if (cnt >= sizeof(buf)) ret = kstrtoul_from_user(ubuf, cnt, 10, &val);
return -EINVAL; if (ret)
if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT;
buf[cnt] = 0;
ret = strict_strtoul(buf, 10, &val);
if (ret < 0)
return ret; return ret;
if (val != 0 && val != 1) if (val != 0 && val != 1)
@ -4199,20 +4163,11 @@ trace_options_core_write(struct file *filp, const char __user *ubuf, size_t cnt,
loff_t *ppos) loff_t *ppos)
{ {
long index = (long)filp->private_data; long index = (long)filp->private_data;
char buf[64];
unsigned long val; unsigned long val;
int ret; int ret;
if (cnt >= sizeof(buf)) ret = kstrtoul_from_user(ubuf, cnt, 10, &val);
return -EINVAL; if (ret)
if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT;
buf[cnt] = 0;
ret = strict_strtoul(buf, 10, &val);
if (ret < 0)
return ret; return ret;
if (val != 0 && val != 1) if (val != 0 && val != 1)

26
kernel/trace/trace_events.c
View file

@ -486,20 +486,11 @@ event_enable_write(struct file *filp, const char __user *ubuf, size_t cnt,
loff_t *ppos) loff_t *ppos)
{ {
struct ftrace_event_call *call = filp->private_data; struct ftrace_event_call *call = filp->private_data;
char buf[64];
unsigned long val; unsigned long val;
int ret; int ret;
if (cnt >= sizeof(buf)) ret = kstrtoul_from_user(ubuf, cnt, 10, &val);
return -EINVAL; if (ret)
if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT;
buf[cnt] = 0;
ret = strict_strtoul(buf, 10, &val);
if (ret < 0)
return ret; return ret;
ret = tracing_update_buffers(); ret = tracing_update_buffers();
@ -571,19 +562,10 @@ system_enable_write(struct file *filp, const char __user *ubuf, size_t cnt,
{ {
const char *system = filp->private_data; const char *system = filp->private_data;
unsigned long val; unsigned long val;
char buf[64];
ssize_t ret; ssize_t ret;
if (cnt >= sizeof(buf)) ret = kstrtoul_from_user(ubuf, cnt, 10, &val);
return -EINVAL; if (ret)
if (copy_from_user(&buf, ubuf, cnt))
return -EFAULT;
buf[cnt] = 0;
ret = strict_strtoul(buf, 10, &val);
if (ret < 0)
return ret; return ret;
ret = tracing_update_buffers(); ret = tracing_update_buffers();

13
kernel/trace/trace_stack.c
View file

@ -156,20 +156,11 @@ stack_max_size_write(struct file *filp, const char __user *ubuf,
{ {
long *ptr = filp->private_data; long *ptr = filp->private_data;
unsigned long val, flags; unsigned long val, flags;
char buf[64];
int ret; int ret;
int cpu; int cpu;
if (count >= sizeof(buf)) ret = kstrtoul_from_user(ubuf, count, 10, &val);
return -EINVAL; if (ret)
if (copy_from_user(&buf, ubuf, count))
return -EFAULT;
buf[count] = 0;
ret = strict_strtoul(buf, 10, &val);
if (ret < 0)
return ret; return ret;
local_irq_save(flags); local_irq_save(flags);