sunrpc - fixup user buffer overrun on 'transports' statistics
Subsystems (3)
PATCH 1/1 sunrpc - fixup user buffer overrun on 'transports' statistics
Vegard Nossum at Sat, 30 Aug 2008 20:44:22 +0200
------------------------------------------------
Quoted 4 lines
I noticed that something weird is going on with
/proc/sys/sunrpc/transports. This file is generated innet/sunrpc/sysctl.c, functionproc_do_xprt(). When I "cat" this file, I get the expected output:
Quoted 8 lines
$ cat /proc/sys/sunrpc/transports tcp 1048576 udp 32768But I think that it does not check the length of the buffer supplied by userspace to
read(). With my original program, I found that the stack was being overwritten by the characters above, even when the length given toread()was just 1.
David Wagner <[email protected]> Sat, 30 Aug 2008 22:55:51 +0000 (UTC)
------------------------------------------------------------------------
Quoted 3 lines
4. Is
proc_dostring()relevant here?
proc_do_xprt doesn't check for userside buffer size indeed so we better to use proc_dostring.
---
Please check, I don't have sunrpc on my machine built.
net/sunrpc/sysctl.c +5 -26
@@ -39,6 +39,7 @@ EXPORT_SYMBOL_GPL(nlm_debug);static struct ctl_table_header *sunrpc_table_header;static ctl_table sunrpc_table[]; +static char sunrpc_transport_stat[256 ];void rpc_register_sysctl (void )
@@ -56,30 +57,6 @@ rpc_unregister_sysctl(void) } } -static int proc_do_xprt (ctl_table *table,int write,struct file *file, -void __user *buffer,size_t *lenp,loff_t *ppos) -{ -char tmpbuf[256 ]; -int len; -if ((*ppos && !write) || !*lenp) { - *lenp =0 ; -return 0 ; - } -if (write) -return -EINVAL ; -else { - len =svc_print_xprts (tmpbuf,sizeof (tmpbuf)); -if (!access_ok (VERIFY_WRITE , buffer, len)) -return -EFAULT ; - -if (__copy_to_user (buffer, tmpbuf, len)) -return -EFAULT ; - } - *lenp -= len; - *ppos += len; -return 0 ; -} -static int proc_dodebug (ctl_table *table,int write,struct file *file,void __user *buffer,size_t *lenp,loff_t *ppos)
@@ -174,9 +151,11 @@ static ctl_table debug_table[] = { }, { .procname = "transports", - .maxlen = 256, + .data = &sunrpc_transport_stat, + .maxlen = sizeof(sunrpc_transport_stat), .mode = 0444, - .proc_handler = &proc_do_xprt, + .proc_handler = &proc_dostring, + .strategy = &sysctl_string }, { .ctl_name = 0 } };
[Cyrill Gorcunov - Sun, Aug 31, 2008 at 01:37:05PM +0400] | Vegard Nossum at Sat, 30 Aug 2008 20:44:22 +0200
...
IT'S CRAP!!! SORRY!!!
- Cyrill -