From f7fb204e4f5519300c31ba7e4bc76b87ca4a5c19 Mon Sep 17 00:00:00 2001 From: James Morris Date: Tue, 30 Aug 2011 10:50:12 +1000 Subject: [PATCH] --- yaml --- r: 264527 b: refs/heads/master c: ad3fa08c4ff84ed87649d72e8497735c85561a3d h: refs/heads/master i: 264525: 3ce98f94d709bed3f83d5fc33b8d5fe3488959d2 264523: 98249d027fdee0f957d56d0d8c589d0d4933b3b1 264519: 6a978663564d0fe0f7dc7684798807e531b24b2c 264511: 05e3124e5cd2ab83048e3e8899143cdfb4d9d58a v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 5 ----- trunk/security/selinux/include/security.h | 3 +++ trunk/security/selinux/selinuxfs.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 620c5db7ec33..aa0a14c5a9a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5813a571876c72766f125b1c6e63414f6822c28 +refs/heads/master: ad3fa08c4ff84ed87649d72e8497735c85561a3d diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index e07cf7fcdce2..4a176b468719 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -2097,9 +2097,6 @@ static int selinux_bprm_secureexec(struct linux_binprm *bprm) return (atsecure || cap_bprm_secureexec(bprm)); } -extern struct vfsmount *selinuxfs_mount; -extern struct dentry *selinux_null; - /* Derived from fs/exec.c:flush_old_files. */ static inline void flush_unauthorized_files(const struct cred *cred, struct files_struct *files) @@ -5803,8 +5800,6 @@ static int selinux_disabled; int selinux_disable(void) { - extern void exit_sel_fs(void); - if (ss_initialized) { /* Not permitted after initial policy load. */ return -EINVAL; diff --git a/trunk/security/selinux/include/security.h b/trunk/security/selinux/include/security.h index 30002c43436f..13b626352f0b 100644 --- a/trunk/security/selinux/include/security.h +++ b/trunk/security/selinux/include/security.h @@ -218,6 +218,9 @@ extern void selinux_status_update_setenforce(int enforcing); extern void selinux_status_update_policyload(int seqno); extern void selinux_complete_init(void); extern int selinux_disable(void); +extern void exit_sel_fs(void); +extern struct dentry *selinux_null; +extern struct vfsmount *selinuxfs_mount; #endif /* _SELINUX_SECURITY_H_ */ diff --git a/trunk/security/selinux/selinuxfs.c b/trunk/security/selinux/selinuxfs.c index d3677c6c12c6..ba2ada5f16a9 100644 --- a/trunk/security/selinux/selinuxfs.c +++ b/trunk/security/selinux/selinuxfs.c @@ -477,7 +477,7 @@ static struct vm_operations_struct sel_mmap_policy_ops = { .page_mkwrite = sel_mmap_policy_fault, }; -int sel_mmap_policy(struct file *filp, struct vm_area_struct *vma) +static int sel_mmap_policy(struct file *filp, struct vm_area_struct *vma) { if (vma->vm_flags & VM_SHARED) { /* do not allow mprotect to make mapping writable */