git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[sfrench/cifs-2.6.git]
/
security
/
dummy.c
diff --git
a/security/dummy.c
b/security/dummy.c
index 8ffd76405b5b69f0b61057be0ffc3fb2af6adb6a..d6a112ce2975c847390fed605ade3d532f4fe03a 100644
(file)
--- a/
security/dummy.c
+++ b/
security/dummy.c
@@
-420,8
+420,12
@@
static int dummy_file_ioctl (struct file *file, unsigned int command,
static int dummy_file_mmap (struct file *file, unsigned long reqprot,
unsigned long prot,
- unsigned long flags)
+ unsigned long flags,
+ unsigned long addr,
+ unsigned long addr_only)
{
+ if (addr < mmap_min_addr)
+ return -EACCES;
return 0;
}