p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug 

The sunrpc debug sysctl files only accept decimal number right now.
But all the XXXDBUG_XXX macros are defined as hexadecimal.
It is not easy to set or check an separate flag.

This patch let those files support accepting hexadecimal number,
(decimal number is also supported). Also, display it as hexadecimal.

v2,
Remove duplicate parsing of '0x...', just using simple_strtol(tmpbuf, &s, 0)
Fix a bug of isspace() checking after parsing

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Kinglong Mee 2015-09-12 09:37:18 +08:00 committed by Trond Myklebust
parent 1ca843a2d2
commit 941c3ff310
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/sunrpc/sysctl.c
View File

@ -76,7 +76,7 @@ static int
proc_dodebug(struct ctl_table *table, int write, proc_dodebug(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos) void __user *buffer, size_t *lenp, loff_t *ppos)
{ {
char tmpbuf[20], c, *s; char tmpbuf[20], c, *s = NULL;
char __user *p; char __user *p;
unsigned int value; unsigned int value;
size_t left, len; size_t left, len;
@ -103,23 +103,24 @@ proc_dodebug(struct ctl_table *table, int write,
return -EFAULT; return -EFAULT;
tmpbuf[left] = '\0'; tmpbuf[left] = '\0';
for (s = tmpbuf, value = 0; '0' <= *s && *s <= '9'; s++, left--) value = simple_strtol(tmpbuf, &s, 0);
value = 10 * value + (*s - '0'); if (s) {
if (*s && !isspace(*s)) left -= (s - tmpbuf);
return -EINVAL; if (left && !isspace(*s))
while (left && isspace(*s)) return -EINVAL;
left--, s++; while (left && isspace(*s))
left--, s++;
} else
left = 0;
*(unsigned int *) table->data = value; *(unsigned int *) table->data = value;
/* Display the RPC tasks on writing to rpc_debug */ /* Display the RPC tasks on writing to rpc_debug */
if (strcmp(table->procname, "rpc_debug") == 0) if (strcmp(table->procname, "rpc_debug") == 0)
rpc_show_tasks(&init_net); rpc_show_tasks(&init_net);
} else { } else {
if (!access_ok(VERIFY_WRITE, buffer, left)) len = sprintf(tmpbuf, "0x%04x", *(unsigned int *) table->data);
return -EFAULT;
len = sprintf(tmpbuf, "%d", *(unsigned int *) table->data);
if (len > left) if (len > left)
len = left; len = left;
if (__copy_to_user(buffer, tmpbuf, len)) if (copy_to_user(buffer, tmpbuf, len))
return -EFAULT; return -EFAULT;
if ((left -= len) > 0) { if ((left -= len) > 0) {
if (put_user('\n', (char __user *)buffer + len)) if (put_user('\n', (char __user *)buffer + len))