summaryrefslogtreecommitdiff
path: root/fs/proc
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2007-10-25 15:27:40 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-25 15:16:49 -0700
commit2a2da53b181bdafcdecb43c457735ee2892ae885 (patch)
tree34f3a05c5db9f2b4d1b911316d97a363b5152e9f /fs/proc
parentde48844398f81cfdf087d56e12c920d620dae8d5 (diff)
downloadlinux-3.10-2a2da53b181bdafcdecb43c457735ee2892ae885.tar.gz
linux-3.10-2a2da53b181bdafcdecb43c457735ee2892ae885.tar.bz2
linux-3.10-2a2da53b181bdafcdecb43c457735ee2892ae885.zip
Fix pointer mismatches in proc_sysctl.c
Fix pointer mismatches in proc_sysctl.c. The proc_handler() method returns a size_t through an arg pointer, but is given a pointer to a ssize_t to return into. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/proc_sysctl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 680c429bfa2..4e57fcf8598 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -171,7 +171,8 @@ static ssize_t proc_sys_read(struct file *filp, char __user *buf,
struct dentry *dentry = filp->f_dentry;
struct ctl_table_header *head;
struct ctl_table *table;
- ssize_t error, res;
+ ssize_t error;
+ size_t res;
table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head);
/* Has the sysctl entry disappeared on us? */
@@ -209,7 +210,8 @@ static ssize_t proc_sys_write(struct file *filp, const char __user *buf,
struct dentry *dentry = filp->f_dentry;
struct ctl_table_header *head;
struct ctl_table *table;
- ssize_t error, res;
+ ssize_t error;
+ size_t res;
table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head);
/* Has the sysctl entry disappeared on us? */