diff options
| author | Chen Gang <xili_gchen_5257@hotmail.com> | 2015-11-05 18:48:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 19:34:48 -0800 |
| commit | 1e3ee14b9355a688ffe24725fa746ab120c42881 (patch) | |
| tree | e70d8443ce609a7f88059c9e305828b19c3fc123 /mm | |
| parent | e6ee219fdd69c87ceaeb421bcd753a63937f8f31 (diff) | |
| download | talos-op-linux-1e3ee14b9355a688ffe24725fa746ab120c42881.tar.gz talos-op-linux-1e3ee14b9355a688ffe24725fa746ab120c42881.zip | |
mm/mmap.c: do not initialize retval in mmap_pgoff()
When fget() fails we can return -EBADF directly.
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index 28d1b3524d88..7e69f30a305e 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1412,13 +1412,13 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len, unsigned long, fd, unsigned long, pgoff) { struct file *file = NULL; - unsigned long retval = -EBADF; + unsigned long retval; if (!(flags & MAP_ANONYMOUS)) { audit_mmap_fd(fd, flags); file = fget(fd); if (!file) - goto out; + return -EBADF; if (is_file_hugepages(file)) len = ALIGN(len, huge_page_size(hstate_file(file))); retval = -EINVAL; @@ -1453,7 +1453,6 @@ SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len, out_fput: if (file) fput(file); -out: return retval; } |
