vserver 1.9.5.x5

[linux-2.6.git] / security / selinux / include / objsec.h

diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
index 03490b2..30a0abc 100644 (file)
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
@@ -33,7 +33,6 @@ struct task_security_struct {
        u32 sid;             /* current SID */
        u32 exec_sid;        /* exec SID */
        u32 create_sid;      /* fscreate SID */
-        struct avc_entry_ref avcr;     /* reference to process permissions */
        u32 ptrace_sid;      /* SID of ptrace parent */
 };
 
@@ -44,7 +43,6 @@ struct inode_security_struct {
        u32 task_sid;        /* SID of creating task */
        u32 sid;             /* SID of this object */
        u16 sclass;       /* security class of this object */
-       struct avc_entry_ref avcr;     /* reference to object permissions */
        unsigned char initialized;     /* initialization flag */
        struct semaphore sem;
        unsigned char inherit;         /* inherit SID from parent entry */
@@ -55,8 +53,6 @@ struct file_security_struct {
        struct file *file;              /* back pointer to file object */
        u32 sid;              /* SID of open file description */
        u32 fown_sid;         /* SID of file owner (for SIGIO) */
-       struct avc_entry_ref avcr;      /* reference to fd permissions */
-       struct avc_entry_ref inode_avcr;     /* reference to object permissions */
 };
 
 struct superblock_security_struct {
@@ -77,7 +73,6 @@ struct msg_security_struct {
         unsigned long magic;           /* magic number for this module */
        struct msg_msg *msg;            /* back pointer */
        u32 sid;              /* SID of message */
-        struct avc_entry_ref avcr;     /* reference to permissions */
 };
 
 struct ipc_security_struct {
@@ -85,7 +80,6 @@ struct ipc_security_struct {
        struct kern_ipc_perm *ipc_perm; /* back pointer */
        u16 sclass;     /* security class of this object */
        u32 sid;              /* SID of IPC resource */
-        struct avc_entry_ref avcr;     /* reference to permissions */
 };
 
 struct bprm_security_struct {
@@ -93,13 +87,18 @@ struct bprm_security_struct {
        struct linux_binprm *bprm;     /* back pointer to bprm object */
        u32 sid;                       /* SID for transformed process */
        unsigned char set;
+
+       /*
+        * unsafe is used to share failure information from bprm_apply_creds()
+        * to bprm_post_apply_creds().
+        */
+       char unsafe;
 };
 
 struct netif_security_struct {
        struct net_device *dev;         /* back pointer */
        u32 if_sid;                     /* SID for this interface */
        u32 msg_sid;                    /* default SID for messages received on this interface */
-       struct avc_entry_ref avcr;      /* reference to permissions */
 };
 
 struct sk_security_struct {