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

Commit f7ca54f4 authored by Frederik Deweerdt's avatar Frederik Deweerdt Committed by Linus Torvalds
Browse files

[PATCH] fix mem_write() return value 



At the beginning of the routine, "copied" is set to 0, but it is no good
because in lines 805 and 812 it is set to other values.  Finally, the
routine returns as if it copied 12 (=ENOMEM) bytes less than it actually
did.

Signed-off-by: default avatarFrederik Deweerdt <frederik.deweerdt@gmail.com>
Acked-by: default avatarEric Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 87d7c8ac

fs/proc/base.c

+2 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ static ssize_t mem_read(struct file * file, char __user * buf, 
static ssize_t mem_write(struct file * file, const char * buf,

			 size_t count, loff_t *ppos)

{

	int copied = 0;

	int copied;

	char *page;

	struct task_struct *task = get_proc_task(file->f_dentry->d_inode);

	unsigned long dst = *ppos;
@@ -814,6 +814,7 @@ static ssize_t mem_write(struct file * file, const char * buf, 
	if (!page)

		goto out;



	copied = 0;

	while (count > 0) {

		int this_len, retval;