|
@@ -1703,8 +1703,8 @@ int __init sysctl_init(void)
|
|
|
|
|
|
#ifdef CONFIG_PROC_SYSCTL
|
|
|
|
|
|
-static int _proc_do_string(void* data, int maxlen, int write,
|
|
|
- void __user *buffer,
|
|
|
+static int _proc_do_string(char *data, int maxlen, int write,
|
|
|
+ char __user *buffer,
|
|
|
size_t *lenp, loff_t *ppos)
|
|
|
{
|
|
|
size_t len;
|
|
@@ -1730,7 +1730,7 @@ static int _proc_do_string(void* data, int maxlen, int write,
|
|
|
len = maxlen-1;
|
|
|
if(copy_from_user(data, buffer, len))
|
|
|
return -EFAULT;
|
|
|
- ((char *) data)[len] = 0;
|
|
|
+ data[len] = 0;
|
|
|
*ppos += *lenp;
|
|
|
} else {
|
|
|
len = strlen(data);
|
|
@@ -1748,10 +1748,10 @@ static int _proc_do_string(void* data, int maxlen, int write,
|
|
|
if (len > *lenp)
|
|
|
len = *lenp;
|
|
|
if (len)
|
|
|
- if(copy_to_user(buffer, data, len))
|
|
|
+ if (copy_to_user(buffer, data, len))
|
|
|
return -EFAULT;
|
|
|
if (len < *lenp) {
|
|
|
- if(put_user('\n', ((char __user *) buffer) + len))
|
|
|
+ if (put_user('\n', buffer + len))
|
|
|
return -EFAULT;
|
|
|
len++;
|
|
|
}
|
|
@@ -1781,8 +1781,8 @@ static int _proc_do_string(void* data, int maxlen, int write,
|
|
|
int proc_dostring(struct ctl_table *table, int write,
|
|
|
void __user *buffer, size_t *lenp, loff_t *ppos)
|
|
|
{
|
|
|
- return _proc_do_string(table->data, table->maxlen, write,
|
|
|
- buffer, lenp, ppos);
|
|
|
+ return _proc_do_string((char *)(table->data), table->maxlen, write,
|
|
|
+ (char __user *)buffer, lenp, ppos);
|
|
|
}
|
|
|
|
|
|
static size_t proc_skip_spaces(char **buf)
|