diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-30 17:11:23 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 10:37:01 -0400 |
commit | 8b3ec6814c83d76b85bd13badc48552836c24839 (patch) | |
tree | 2430a4511c7ea41f67b0d841f4c42eac43828db3 /include | |
parent | e5467859f7f79b69fc49004403009dfdba3bec53 (diff) |
take security_mmap_file() outside of ->mmap_sem
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/security.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index f1bae0963ddc..4e5a73cdbbef 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -1745,8 +1745,8 @@ int security_file_permission(struct file *file, int mask); | |||
1745 | int security_file_alloc(struct file *file); | 1745 | int security_file_alloc(struct file *file); |
1746 | void security_file_free(struct file *file); | 1746 | void security_file_free(struct file *file); |
1747 | int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg); | 1747 | int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg); |
1748 | int security_mmap_file(struct file *file, unsigned long reqprot, | 1748 | int security_mmap_file(struct file *file, unsigned long prot, |
1749 | unsigned long prot, unsigned long flags); | 1749 | unsigned long flags); |
1750 | int security_mmap_addr(unsigned long addr); | 1750 | int security_mmap_addr(unsigned long addr); |
1751 | int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, | 1751 | int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, |
1752 | unsigned long prot); | 1752 | unsigned long prot); |
@@ -2183,8 +2183,7 @@ static inline int security_file_ioctl(struct file *file, unsigned int cmd, | |||
2183 | return 0; | 2183 | return 0; |
2184 | } | 2184 | } |
2185 | 2185 | ||
2186 | static inline int security_mmap_file(struct file *file, unsigned long reqprot, | 2186 | static inline int security_mmap_file(struct file *file, unsigned long prot, |
2187 | unsigned long prot, | ||
2188 | unsigned long flags) | 2187 | unsigned long flags) |
2189 | { | 2188 | { |
2190 | return 0; | 2189 | return 0; |