[PATCH] cpuset read past eof memory leak fix
Don't leak a page of memory if user reads a cpuset file past eof. Signed-off-by: KUROSAWA Takahiro <kurosawa@valinux.co.jp> Signed-off-by: Paul Jackson <pj@sgi.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
2dd3c1df95
commit
5134fc15b6
|
@ -969,7 +969,7 @@ static ssize_t cpuset_common_file_read(struct file *file, char __user *buf,
|
||||||
ssize_t retval = 0;
|
ssize_t retval = 0;
|
||||||
char *s;
|
char *s;
|
||||||
char *start;
|
char *start;
|
||||||
size_t n;
|
ssize_t n;
|
||||||
|
|
||||||
if (!(page = (char *)__get_free_page(GFP_KERNEL)))
|
if (!(page = (char *)__get_free_page(GFP_KERNEL)))
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -999,12 +999,13 @@ static ssize_t cpuset_common_file_read(struct file *file, char __user *buf,
|
||||||
*s++ = '\n';
|
*s++ = '\n';
|
||||||
*s = '\0';
|
*s = '\0';
|
||||||
|
|
||||||
/* Do nothing if *ppos is at the eof or beyond the eof. */
|
|
||||||
if (s - page <= *ppos)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
start = page + *ppos;
|
start = page + *ppos;
|
||||||
n = s - start;
|
n = s - start;
|
||||||
|
|
||||||
|
/* Do nothing if *ppos is at the eof or beyond the eof. */
|
||||||
|
if (n <= 0)
|
||||||
|
goto out;
|
||||||
|
|
||||||
retval = n - copy_to_user(buf, start, min(n, nbytes));
|
retval = n - copy_to_user(buf, start, min(n, nbytes));
|
||||||
*ppos += retval;
|
*ppos += retval;
|
||||||
out:
|
out:
|
||||||
|
|
Loading…
Reference in a new issue