diff options
Diffstat (limited to 'security/selinux/include/security.h')
| -rw-r--r-- | security/selinux/include/security.h | 43 | 
1 files changed, 31 insertions, 12 deletions
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 671273eb111..ce7852cf526 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -8,6 +8,7 @@  #ifndef _SELINUX_SECURITY_H_  #define _SELINUX_SECURITY_H_ +#include <linux/dcache.h>  #include <linux/magic.h>  #include <linux/types.h>  #include "flask.h" @@ -28,26 +29,32 @@  #define POLICYDB_VERSION_POLCAP		22  #define POLICYDB_VERSION_PERMISSIVE	23  #define POLICYDB_VERSION_BOUNDARY	24 +#define POLICYDB_VERSION_FILENAME_TRANS	25 +#define POLICYDB_VERSION_ROLETRANS	26 +#define POLICYDB_VERSION_NEW_OBJECT_DEFAULTS	27 +#define POLICYDB_VERSION_DEFAULT_TYPE	28 +#define POLICYDB_VERSION_CONSTRAINT_NAMES	29  /* Range of policy versions we understand*/  #define POLICYDB_VERSION_MIN   POLICYDB_VERSION_BASE  #ifdef CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX  #define POLICYDB_VERSION_MAX	CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX_VALUE  #else -#define POLICYDB_VERSION_MAX	POLICYDB_VERSION_BOUNDARY +#define POLICYDB_VERSION_MAX	POLICYDB_VERSION_CONSTRAINT_NAMES  #endif  /* Mask for just the mount related flags */  #define SE_MNTMASK	0x0f  /* Super block security struct flags for mount options */ +/* BE CAREFUL, these need to be the low order bits for selinux_get_mnt_opts */  #define CONTEXT_MNT	0x01  #define FSCONTEXT_MNT	0x02  #define ROOTCONTEXT_MNT	0x04  #define DEFCONTEXT_MNT	0x08 +#define SBLABEL_MNT	0x10  /* Non-mount related flags */ -#define SE_SBINITIALIZED	0x10 -#define SE_SBPROC		0x20 -#define SE_SBLABELSUPP	0x40 +#define SE_SBINITIALIZED	0x0100 +#define SE_SBPROC		0x0200  #define CONTEXT_STR	"context="  #define FSCONTEXT_STR	"fscontext=" @@ -63,12 +70,15 @@ extern int selinux_enabled;  enum {  	POLICYDB_CAPABILITY_NETPEER,  	POLICYDB_CAPABILITY_OPENPERM, +	POLICYDB_CAPABILITY_REDHAT1, +	POLICYDB_CAPABILITY_ALWAYSNETWORK,  	__POLICYDB_CAPABILITY_MAX  };  #define POLICYDB_CAPABILITY_MAX (__POLICYDB_CAPABILITY_MAX - 1)  extern int selinux_policycap_netpeer;  extern int selinux_policycap_openperm; +extern int selinux_policycap_alwaysnetwork;  /*   * type_datum properties @@ -83,7 +93,7 @@ extern int selinux_policycap_openperm;  int security_mls_enabled(void);  int security_load_policy(void *data, size_t len); -int security_read_policy(void **data, ssize_t *len); +int security_read_policy(void **data, size_t *len);  size_t security_policydb_len(void);  int security_policycap_supported(unsigned int req_cap); @@ -106,11 +116,11 @@ void security_compute_av(u32 ssid, u32 tsid,  void security_compute_av_user(u32 ssid, u32 tsid,  			     u16 tclass, struct av_decision *avd); -int security_transition_sid(u32 ssid, u32 tsid, -			    u16 tclass, u32 *out_sid); +int security_transition_sid(u32 ssid, u32 tsid, u16 tclass, +			    const struct qstr *qstr, u32 *out_sid); -int security_transition_sid_user(u32 ssid, u32 tsid, -				 u16 tclass, u32 *out_sid); +int security_transition_sid_user(u32 ssid, u32 tsid, u16 tclass, +				 const char *objname, u32 *out_sid);  int security_member_sid(u32 ssid, u32 tsid,  	u16 tclass, u32 *out_sid); @@ -124,7 +134,7 @@ int security_sid_to_context(u32 sid, char **scontext,  int security_sid_to_context_force(u32 sid, char **scontext, u32 *scontext_len);  int security_context_to_sid(const char *scontext, u32 scontext_len, -	u32 *out_sid); +			    u32 *out_sid, gfp_t gfp);  int security_context_to_sid_default(const char *scontext, u32 scontext_len,  				    u32 *out_sid, u32 def_sid, gfp_t gfp_flags); @@ -164,9 +174,10 @@ int security_get_allow_unknown(void);  #define SECURITY_FS_USE_GENFS		4 /* use the genfs support */  #define SECURITY_FS_USE_NONE		5 /* no labeling support */  #define SECURITY_FS_USE_MNTPOINT	6 /* use mountpoint labeling */ +#define SECURITY_FS_USE_NATIVE		7 /* use native label support */ +#define SECURITY_FS_USE_MAX		7 /* Highest SECURITY_FS_USE_XXX */ -int security_fs_use(const char *fstype, unsigned int *behavior, -	u32 *sid); +int security_fs_use(struct super_block *sb);  int security_genfs_sid(const char *fstype, char *name, u16 sclass,  	u32 *sid); @@ -213,6 +224,14 @@ struct selinux_kernel_status {  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 path selinux_null; +extern struct vfsmount *selinuxfs_mount; +extern void selnl_notify_setenforce(int val); +extern void selnl_notify_policyload(u32 seqno); +extern int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm);  #endif /* _SELINUX_SECURITY_H_ */  | 
