git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6]
/
security
/
commoncap.c
diff --git
a/security/commoncap.c
b/security/commoncap.c
index
3852e94
..
fe30751
100644
(file)
--- a/
security/commoncap.c
+++ b/
security/commoncap.c
@@
-1005,7
+1005,7
@@
int cap_file_mmap(struct file *file, unsigned long reqprot,
{
int ret = 0;
- if (addr < mmap_min_addr) {
+ if (addr <
dac_
mmap_min_addr) {
ret = cap_capable(current, current_cred(), CAP_SYS_RAWIO,
SECURITY_CAP_AUDIT);
/* set PF_SUPERPRIV if it turns out we allow the low mmap */