projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e6ee219
)
mm/mmap.c: do not initialize retval in mmap_pgoff()
author
Chen Gang
<
[email protected]
>
Fri, 6 Nov 2015 02:48:35 +0000
(18:48 -0800)
committer
Linus Torvalds
<
[email protected]
>
Fri, 6 Nov 2015 03:34:48 +0000
(19:34 -0800)
When fget() fails we can return -EBADF directly.
Signed-off-by: Chen Gang <
[email protected]
>
Acked-by: Oleg Nesterov <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
mm/mmap.c
patch
|
blob
|
history
diff --git
a/mm/mmap.c
b/mm/mmap.c
index 28d1b3524d88f0f131430e14ef217ce8c755400c..7e69f30a305eb929a93326dbdab3d4bbb6299528 100644
(file)
--- 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;
}