Commit 1e3ee14b authored by Chen Gang's avatar Chen Gang Committed by Linus Torvalds

mm/mmap.c: do not initialize retval in mmap_pgoff()

When fget() fails we can return -EBADF directly.
Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e6ee219f
...@@ -1412,13 +1412,13 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len, ...@@ -1412,13 +1412,13 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
unsigned long, fd, unsigned long, pgoff) unsigned long, fd, unsigned long, pgoff)
{ {
struct file *file = NULL; struct file *file = NULL;
unsigned long retval = -EBADF; unsigned long retval;
if (!(flags & MAP_ANONYMOUS)) { if (!(flags & MAP_ANONYMOUS)) {
audit_mmap_fd(fd, flags); audit_mmap_fd(fd, flags);
file = fget(fd); file = fget(fd);
if (!file) if (!file)
goto out; return -EBADF;
if (is_file_hugepages(file)) if (is_file_hugepages(file))
len = ALIGN(len, huge_page_size(hstate_file(file))); len = ALIGN(len, huge_page_size(hstate_file(file)));
retval = -EINVAL; retval = -EINVAL;
...@@ -1453,7 +1453,6 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len, ...@@ -1453,7 +1453,6 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
out_fput: out_fput:
if (file) if (file)
fput(file); fput(file);
out:
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment