aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2007-10-25 10:27:40 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-25 18:16:49 -0400
commit2a2da53b181bdafcdecb43c457735ee2892ae885 (patch)
tree34f3a05c5db9f2b4d1b911316d97a363b5152e9f
parentde48844398f81cfdf087d56e12c920d620dae8d5 (diff)
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>
-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 680c429bfa22..4e57fcf85982 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,
171 struct dentry *dentry = filp->f_dentry; 171 struct dentry *dentry = filp->f_dentry;
172 struct ctl_table_header *head; 172 struct ctl_table_header *head;
173 struct ctl_table *table; 173 struct ctl_table *table;
174 ssize_t error, res; 174 ssize_t error;
175 size_t res;
175 176
176 table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head); 177 table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head);
177 /* Has the sysctl entry disappeared on us? */ 178 /* Has the sysctl entry disappeared on us? */
@@ -209,7 +210,8 @@ static ssize_t proc_sys_write(struct file *filp, const char __user *buf,
209 struct dentry *dentry = filp->f_dentry; 210 struct dentry *dentry = filp->f_dentry;
210 struct ctl_table_header *head; 211 struct ctl_table_header *head;
211 struct ctl_table *table; 212 struct ctl_table *table;
212 ssize_t error, res; 213 ssize_t error;
214 size_t res;
213 215
214 table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head); 216 table = do_proc_sys_lookup(dentry->d_parent, &dentry->d_name, &head);
215 /* Has the sysctl entry disappeared on us? */ 217 /* Has the sysctl entry disappeared on us? */