selinux: Cache NetLabel secattrs in the socket's security struct

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

diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
index 957b10d..f8be8d7 100644 (file)
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
@@ -4,16 +4,16 @@
  *  This file contains the SELinux security data structures for kernel objects.
  *
  *  Author(s):  Stephen Smalley, <sds@epoch.ncsc.mil>
- *              Chris Vance, <cvance@nai.com>
- *              Wayne Salamon, <wsalamon@nai.com>
- *              James Morris <jmorris@redhat.com>
+ *             Chris Vance, <cvance@nai.com>
+ *             Wayne Salamon, <wsalamon@nai.com>
+ *             James Morris <jmorris@redhat.com>
  *
  *  Copyright (C) 2001,2002 Networks Associates Technology, Inc.
  *  Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris@redhat.com>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License version 2,
- *      as published by the Free Software Foundation.
+ *     as published by the Free Software Foundation.
  */
 #ifndef _SELINUX_OBJSEC_H_
 #define _SELINUX_OBJSEC_H_
@@ -28,58 +28,57 @@
 #include "avc.h"
 
 struct task_security_struct {
-       u32 osid;            /* SID prior to last execve */
-       u32 sid;             /* current SID */
-       u32 exec_sid;        /* exec SID */
-       u32 create_sid;      /* fscreate SID */
-       u32 keycreate_sid;   /* keycreate SID */
-       u32 sockcreate_sid;  /* fscreate SID */
+       u32 osid;               /* SID prior to last execve */
+       u32 sid;                /* current SID */
+       u32 exec_sid;           /* exec SID */
+       u32 create_sid;         /* fscreate SID */
+       u32 keycreate_sid;      /* keycreate SID */
+       u32 sockcreate_sid;     /* fscreate SID */
 };
 
 struct inode_security_struct {
-        struct inode *inode;           /* back pointer to inode object */
-       struct list_head list;         /* list of inode_security_struct */
-       u32 task_sid;        /* SID of creating task */
-       u32 sid;             /* SID of this object */
-       u16 sclass;       /* security class of this object */
-       unsigned char initialized;     /* initialization flag */
+       struct inode *inode;    /* back pointer to inode object */
+       struct list_head list;  /* list of inode_security_struct */
+       u32 task_sid;           /* SID of creating task */
+       u32 sid;                /* SID of this object */
+       u16 sclass;             /* security class of this object */
+       unsigned char initialized;      /* initialization flag */
        struct mutex lock;
-       unsigned char inherit;         /* inherit SID from parent entry */
 };
 
 struct file_security_struct {
-       u32 sid;              /* SID of open file description */
-       u32 fown_sid;         /* SID of file owner (for SIGIO) */
-       u32 isid;             /* SID of inode at the time of file open */
-       u32 pseqno;           /* Policy seqno at the time of file open */
+       u32 sid;                /* SID of open file description */
+       u32 fown_sid;           /* SID of file owner (for SIGIO) */
+       u32 isid;               /* SID of inode at the time of file open */
+       u32 pseqno;             /* Policy seqno at the time of file open */
 };
 
 struct superblock_security_struct {
-       struct super_block *sb;         /* back pointer to sb object */
-       struct list_head list;          /* list of superblock_security_struct */
+       struct super_block *sb;         /* back pointer to sb object */
+       struct list_head list;          /* list of superblock_security_struct */
        u32 sid;                        /* SID of file system superblock */
        u32 def_sid;                    /* default SID for labeling */
        u32 mntpoint_sid;               /* SECURITY_FS_USE_MNTPOINT context for files */
-       unsigned int behavior;          /* labeling behavior */
-       unsigned char initialized;      /* initialization flag */
+       unsigned int behavior;          /* labeling behavior */
+       unsigned char initialized;      /* initialization flag */
        unsigned char flags;            /* which mount options were specified */
-       unsigned char proc;             /* proc fs */
+       unsigned char proc;             /* proc fs */
        struct mutex lock;
        struct list_head isec_head;
        spinlock_t isec_lock;
 };
 
 struct msg_security_struct {
-       u32 sid;              /* SID of message */
+       u32 sid;        /* SID of message */
 };
 
 struct ipc_security_struct {
        u16 sclass;     /* security class of this object */
-       u32 sid;              /* SID of IPC resource */
+       u32 sid;        /* SID of IPC resource */
 };
 
 struct bprm_security_struct {
-       u32 sid;                       /* SID for transformed process */
+       u32 sid;                /* SID for transformed process */
        unsigned char set;
 
        /*
@@ -103,21 +102,30 @@ struct netnode_security_struct {
        u16 family;                     /* address family */
 };
 
+struct netport_security_struct {
+       u32 sid;                        /* SID for this node */
+       u16 port;                       /* port number */
+       u8 protocol;                    /* transport protocol */
+};
+
 struct sk_security_struct {
-       u32 sid;                        /* SID of this object */
-       u32 peer_sid;                   /* SID of peer */
-       u16 sclass;                     /* sock security class */
 #ifdef CONFIG_NETLABEL
        enum {                          /* NetLabel state */
                NLBL_UNSET = 0,
                NLBL_REQUIRE,
                NLBL_LABELED,
+               NLBL_REQSKB,
+               NLBL_CONNLABELED,
        } nlbl_state;
+       struct netlbl_lsm_secattr *nlbl_secattr; /* NetLabel sec attributes */
 #endif
+       u32 sid;                        /* SID of this object */
+       u32 peer_sid;                   /* SID of peer */
+       u16 sclass;                     /* sock security class */
 };
 
 struct key_security_struct {
-       u32 sid;         /* SID of key */
+       u32 sid;        /* SID of key */
 };
 
 extern unsigned int selinux_checkreqprot;