From d02331e887468d6b7c6b362c94174059faa5dd7a Mon Sep 17 00:00:00 2001 From: James Morris Date: Tue, 30 Aug 2011 14:17:34 +1000 Subject: [PATCH] --- yaml --- r: 285026 b: refs/heads/master c: e8a65a3f67f8a85802c0a0250e48c4c4652d0da0 h: refs/heads/master 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 ac170cec511d..ab57e6df8ef2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6063c0461b947c26a77674f33a3409eb99e15d2f +refs/heads/master: e8a65a3f67f8a85802c0a0250e48c4c4652d0da0 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 */