proc: sysctl: rename proc_doutsstring to proc_do_uts_string
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/3 proc: sysctl: rename proc_doutsstring to proc_do_uts_string
From: Sam Vilain <[email protected]>
'proc_doutsstring' is confusing; delimit the word with more underscores.
Cc Serge E. Hallyn <[email protected]>
Cc Kirill Korotaev <[email protected]>
Cc "Eric W. Biederman" <[email protected]>
Cc Herbert Poetzl <[email protected]>
Cc Andrey Savochkin <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Sam Vilain <[email protected]>
---
One Signed-off-by...
kernel/sysctl.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
kernel/sysctl.c +8 -8
@@ -141,7 +141,7 @@ #endifstatic int parse_table (int __user *,int ,void __user *,size_t __user *,void __user *,size_t ,ctl_table *,void **); -static int proc_doutsstring (ctl_table *table,int write,struct file *filp, +static int proc_do_uts_string (ctl_table *table,int write,struct file *filp,void __user *buffer,size_t *lenp,loff_t *ppos);static ctl_table root_table[];
@@ -244,7 +244,7 @@ static ctl_table kern_table[] = { .data = init_uts_ns.name.sysname, .maxlen = sizeof(init_uts_ns.name.sysname), .mode = 0444, - .proc_handler = &proc_doutsstring, + .proc_handler = &proc_do_uts_string, .strategy = &sysctl_string, }, {
@@ -253,7 +253,7 @@ static ctl_table kern_table[] = { .data = init_uts_ns.name.release, .maxlen = sizeof(init_uts_ns.name.release), .mode = 0444, - .proc_handler = &proc_doutsstring, + .proc_handler = &proc_do_uts_string, .strategy = &sysctl_string, }, {
@@ -262,7 +262,7 @@ static ctl_table kern_table[] = { .data = init_uts_ns.name.version, .maxlen = sizeof(init_uts_ns.name.version), .mode = 0444, - .proc_handler = &proc_doutsstring, + .proc_handler = &proc_do_uts_string, .strategy = &sysctl_string, }, {
@@ -271,7 +271,7 @@ static ctl_table kern_table[] = { .data = init_uts_ns.name.nodename, .maxlen = sizeof(init_uts_ns.name.nodename), .mode = 0644, - .proc_handler = &proc_doutsstring, + .proc_handler = &proc_do_uts_string, .strategy = &sysctl_string, }, {
@@ -280,7 +280,7 @@ static ctl_table kern_table[] = { .data = init_uts_ns.name.domainname, .maxlen = sizeof(init_uts_ns.name.domainname), .mode = 0644, - .proc_handler = &proc_doutsstring, + .proc_handler = &proc_do_uts_string, .strategy = &sysctl_string, }, {
@@ -1677,7 +1677,7 @@ int proc_dostring(ctl_table *table, int* to observe. Should this be in kernel/sys.c ???? */ -static int proc_doutsstring (ctl_table *table,int write,struct file *filp, +static int proc_do_uts_string (ctl_table *table,int write,struct file *filp,void __user *buffer,size_t *lenp,loff_t *ppos) {int r;
@@ -2256,7 +2256,7 @@ int proc_dostring(ctl_table *table, intreturn -ENOSYS ; } -static int proc_doutsstring (ctl_table *table,int write,struct file *filp, +static int proc_do_uts_string (ctl_table *table,int write,struct file *filp,void __user *buffer,size_t *lenp,loff_t *ppos) {return -ENOSYS ;
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/3 proc: sysctl: add _proc_do_string helper
The logic in proc_do_string is worth re-using without passing in a ctl_table structure (say, we want to calculate a pointer and pass that in instead); pass in the two fields it uses from that structure as explicit arguments.
Cc Serge E. Hallyn <[email protected]>
Cc Kirill Korotaev <[email protected]>
Cc "Eric W. Biederman" <[email protected]>
Cc Herbert Poetzl <[email protected]>
Cc Andrey Savochkin <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Sam Vilain <[email protected]>
---
Two Signed-off-by:'s...
kernel/sysctl.c | 65 ++++++++++++++++++++++++++++++------------------------- 1 files changed, 36 insertions(+), 29 deletions(-)
kernel/sysctl.c +36 -29
@@ -1605,32 +1605,14 @@ static ssize_t proc_writesys(struct filereturn do_rw_proc (1 , file, (char __user *) buf, count, ppos); } -/** -* proc_dostring - read a string sysctl -* @table: the sysctl table -* @write: %TRUE if this is a write to the sysctl file -* @filp: the file structure -* @buffer: the user buffer -* @lenp: the size of the user buffer -* @ppos: file position -* -* Reads/writes a string from/to the user buffer. If the kernel -* buffer provided is not large enough to hold the string, the -* string is truncated. The copied string is %NULL-terminated. -* If the string is being read by the user process, it is copied -* and a newline '\n' is added. It is truncated if the buffer is -* not large enough. -* -* Returns 0 on success. -*/ -int proc_dostring (ctl_table *table,int write,struct file *filp, -void __user *buffer,size_t *lenp,loff_t *ppos) +int _proc_do_string (void * data,int maxlen,int write,struct file *filp, +void __user *buffer,size_t *lenp,loff_t *ppos) {size_t len;char __user *p;char c; -if (!table->data || !table->maxlen || !*lenp || +if (!data || !maxlen || !*lenp || (*ppos && !write)) { *lenp =0 ;return 0 ;
@@ -1646,20 +1628,20 @@ int proc_dostring(ctl_table *table, intbreak ; len++; } -if (len >= table->maxlen) - len = table->maxlen-1 ; -if (copy_from_user (table->data, buffer, len)) +if (len >= maxlen) + len = maxlen-1 ; +if (copy_from_user (data, buffer, len))return -EFAULT ; - ((char *) table->data)[len] =0 ; + ((char *) data)[len] =0 ; *ppos += *lenp; }else { - len =strlen (table->data); -if (len > table->maxlen) - len = table->maxlen; + len =strlen (data); +if (len > maxlen) + len = maxlen;if (len > *lenp) len = *lenp;if (len) -if (copy_to_user (buffer, table->data, len)) +if (copy_to_user (buffer, data, len))return -EFAULT ;if (len < *lenp) {if (put_user ('\n' , ((char __user *) buffer) + len))
@@ -1672,6 +1654,31 @@ int proc_dostring(ctl_table *table, intreturn 0 ; } +/** +* proc_dostring - read a string sysctl +* @table: the sysctl table +* @write: %TRUE if this is a write to the sysctl file +* @filp: the file structure +* @buffer: the user buffer +* @lenp: the size of the user buffer +* @ppos: file position +* +* Reads/writes a string from/to the user buffer. If the kernel +* buffer provided is not large enough to hold the string, the +* string is truncated. The copied string is %NULL-terminated. +* If the string is being read by the user process, it is copied +* and a newline '\n' is added. It is truncated if the buffer is +* not large enough. +* +* Returns 0 on success. +*/ +int proc_dostring (ctl_table *table,int write,struct file *filp, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +return _proc_do_string (table->data, table->maxlen, write, filp, + buffer, lenp, ppos); +} +/* * Special case of dostring for the UTS structure. This has locks * to observe. Should this be in kernel/sys.c ????