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>
This commit is contained in:
parent
e6ee219fdd
commit
1e3ee14b93
|
@ -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,
|
||||||
out_fput:
|
out_fput:
|
||||||
if (file)
|
if (file)
|
||||||
fput(file);
|
fput(file);
|
||||||
out:
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue