diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-30 13:11:37 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-31 13:10:54 -0400 |
commit | d007794a182bc072a7b7479909dbd0d67ba341be (patch) | |
tree | 75aa7ccd563a0fe8b60391824c92f64098674dda /include/linux/security.h | |
parent | cf74d14c4fbce9bcc9eb62f52d721d3399a2b87f (diff) |
split cap_mmap_addr() out of cap_file_mmap()
... switch callers.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index ab0e091ce5fa..4ad59c9fa731 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -86,6 +86,7 @@ extern int cap_inode_setxattr(struct dentry *dentry, const char *name, | |||
86 | extern int cap_inode_removexattr(struct dentry *dentry, const char *name); | 86 | extern int cap_inode_removexattr(struct dentry *dentry, const char *name); |
87 | extern int cap_inode_need_killpriv(struct dentry *dentry); | 87 | extern int cap_inode_need_killpriv(struct dentry *dentry); |
88 | extern int cap_inode_killpriv(struct dentry *dentry); | 88 | extern int cap_inode_killpriv(struct dentry *dentry); |
89 | extern int cap_mmap_addr(unsigned long addr); | ||
89 | extern int cap_file_mmap(struct file *file, unsigned long reqprot, | 90 | extern int cap_file_mmap(struct file *file, unsigned long reqprot, |
90 | unsigned long prot, unsigned long flags, | 91 | unsigned long prot, unsigned long flags, |
91 | unsigned long addr, unsigned long addr_only); | 92 | unsigned long addr, unsigned long addr_only); |
@@ -2187,7 +2188,7 @@ static inline int security_file_mmap(struct file *file, unsigned long reqprot, | |||
2187 | unsigned long addr, | 2188 | unsigned long addr, |
2188 | unsigned long addr_only) | 2189 | unsigned long addr_only) |
2189 | { | 2190 | { |
2190 | return cap_file_mmap(file, reqprot, prot, flags, addr, addr_only); | 2191 | return cap_mmap_addr(addr); |
2191 | } | 2192 | } |
2192 | 2193 | ||
2193 | static inline int security_file_mprotect(struct vm_area_struct *vma, | 2194 | static inline int security_file_mprotect(struct vm_area_struct *vma, |