Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a2da53b authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent de488443

fs/proc/proc_sysctl.c

+4 −2
Original line number Diff line number Diff line
@@ -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? */