diff options
author | Eric Paris <eparis@redhat.com> | 2009-07-31 12:53:58 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-08-06 09:02:17 +1000 |
commit | 7c73875e7dda627040b12c19b01db634fa7f0fd1 (patch) | |
tree | f8f4df20bdcafb1bd981c8a7b0797d13b2625b27 /security/capability.c | |
parent | 012a5299a29672039f42944a37984558393ef769 (diff) | |
download | linux-stable-7c73875e7dda627040b12c19b01db634fa7f0fd1.tar.gz linux-stable-7c73875e7dda627040b12c19b01db634fa7f0fd1.tar.bz2 linux-stable-7c73875e7dda627040b12c19b01db634fa7f0fd1.zip |
Capabilities: move cap_file_mmap to commoncap.c
Currently we duplicate the mmap_min_addr test in cap_file_mmap and in
security_file_mmap if !CONFIG_SECURITY. This patch moves cap_file_mmap
into commoncap.c and then calls that function directly from
security_file_mmap ifndef CONFIG_SECURITY like all of the other capability
checks are done.
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/capability.c')
-rw-r--r-- | security/capability.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/security/capability.c b/security/capability.c index f218dd361647..ec0573054024 100644 --- a/security/capability.c +++ b/security/capability.c @@ -330,15 +330,6 @@ static int cap_file_ioctl(struct file *file, unsigned int command, return 0; } -static int cap_file_mmap(struct file *file, unsigned long reqprot, - unsigned long prot, unsigned long flags, - unsigned long addr, unsigned long addr_only) -{ - if ((addr < mmap_min_addr) && !capable(CAP_SYS_RAWIO)) - return -EACCES; - return 0; -} - static int cap_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, unsigned long prot) { |