xnu-1228.3.13.tar.gz

[apple/xnu.git] / bsd / sys / imgact.h

diff --git a/bsd/sys/imgact.h b/bsd/sys/imgact.h
index cef71ad2c21fd402456ecf4fa1e013d43b5bae84..1bed0a7c5ee361791dd6aa67ba2790d3654710dd 100644 (file)
--- a/bsd/sys/imgact.h
+++ b/bsd/sys/imgact.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2005 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -57,11 +57,18 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */

+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */

 #ifndef _SYS_IMGACT_H_
 #define        _SYS_IMGACT_H_
 
 #define        IMG_SHSIZE      512     /* largest shell interpreter, in bytes */
 
 #ifndef _SYS_IMGACT_H_
 #define        _SYS_IMGACT_H_
 
 #define        IMG_SHSIZE      512     /* largest shell interpreter, in bytes */
 

+struct label;

 struct proc;
 struct nameidata;
 
 struct proc;
 struct nameidata;
 


@@ -69,9 +76,12 @@ struct image_params {
        user_addr_t     ip_user_fname;          /* argument */
        user_addr_t     ip_user_argv;           /* argument */
        user_addr_t     ip_user_envv;           /* argument */
        user_addr_t     ip_user_fname;          /* argument */
        user_addr_t     ip_user_argv;           /* argument */
        user_addr_t     ip_user_envv;           /* argument */

+       int             ip_seg;                 /* segment for arguments */

        struct vnode    *ip_vp;                 /* file */
        struct vnode_attr       *ip_vattr;      /* run file attributes */
        struct vnode_attr       *ip_origvattr;  /* invocation file attributes */
        struct vnode    *ip_vp;                 /* file */
        struct vnode_attr       *ip_vattr;      /* run file attributes */
        struct vnode_attr       *ip_origvattr;  /* invocation file attributes */

+       cpu_type_t      ip_origcputype;         /* cputype of invocation file */
+       cpu_subtype_t   ip_origcpusubtype;      /* subtype of invocation file */

        char            *ip_vdata;              /* file data (up to one page) */
        int             ip_flags;               /* image flags */
        int             ip_argc;                /* argument count */
        char            *ip_vdata;              /* file data (up to one page) */
        int             ip_flags;               /* image flags */
        int             ip_argc;                /* argument count */


@@ -87,10 +97,17 @@ struct image_params {
 
        /* Next two fields are for support of architecture translation... */
        char            *ip_p_comm;             /* optional alt p->p_comm */
 
        /* Next two fields are for support of architecture translation... */
        char            *ip_p_comm;             /* optional alt p->p_comm */

-       char            *ip_tws_cache_name;     /* task working set cache */

        struct vfs_context      *ip_vfs_context;        /* VFS context */
        struct nameidata *ip_ndp;               /* current nameidata */
        thread_t        ip_vfork_thread;        /* thread created, if vfork */
        struct vfs_context      *ip_vfs_context;        /* VFS context */
        struct nameidata *ip_ndp;               /* current nameidata */
        thread_t        ip_vfork_thread;        /* thread created, if vfork */

+
+       struct label    *ip_execlabelp;         /* label of the executable */
+       struct label    *ip_scriptlabelp;       /* label of the script */
+       unsigned int    ip_csflags;             /* code signing flags */
+       int             ip_no_trans;            /* allow suid/sgid transition?*/
+       void            *ip_px_sa;
+       void            *ip_px_sfa;
+       void            *ip_px_spa;

 };
 
 /*
 };
 
 /*


@@ -98,11 +115,7 @@ struct image_params {
  */
 #define        IMGPF_NONE      0x00000000              /* No flags */
 #define        IMGPF_INTERPRET 0x00000001              /* Interpreter invoked */
  */
 #define        IMGPF_NONE      0x00000000              /* No flags */
 #define        IMGPF_INTERPRET 0x00000001              /* Interpreter invoked */

-#if defined (__i386__) || defined(__x86_64__)
-#define        IMGPF_POWERPC   0x00000002              /* ppc mode */
-#else
-#define        IMGPF_RESERVED1 0x00000002              /* reserved */
-#endif
+#define        IMGPF_POWERPC   0x00000002              /* ppc mode for x86 */

 #define        IMGPF_WAS_64BIT 0x00000004              /* exec from a 64Bit binary */
 #define        IMGPF_IS_64BIT  0x00000008              /* exec to a 64Bit binary */
 
 #define        IMGPF_WAS_64BIT 0x00000004              /* exec from a 64Bit binary */
 #define        IMGPF_IS_64BIT  0x00000008              /* exec to a 64Bit binary */