xnu-3247.1.106.tar.gz

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

diff --git a/bsd/sys/imgact.h b/bsd/sys/imgact.h
index 36fb8d7e93b32e0204877f92944dc7e42c6b57cc..03db89c613ad3c3a12e826f75440f21326044e4e 100644 (file)
--- a/bsd/sys/imgact.h
+++ b/bsd/sys/imgact.h
@@ -1,5 +1,5 @@
 /*
 /*

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

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


@@ -85,41 +85,52 @@ struct image_params {
        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 */

-       char            *ip_argv;               /* argument vector beginning */

        int             ip_envc;                /* environment count */
        int             ip_envc;                /* environment count */

+       int             ip_applec;              /* apple vector count */
+
+       char            *ip_startargv;          /* argument vector beginning */
+       char            *ip_endargv;    /* end of argv/start of envv */
+       char            *ip_endenvv;    /* end of envv/start of applev */
+

        char            *ip_strings;            /* base address for strings */
        char            *ip_strendp;            /* current end pointer */
        char            *ip_strings;            /* base address for strings */
        char            *ip_strendp;            /* current end pointer */

-       char            *ip_strendargvp;        /* end of argv/start of envp */
-       int             ip_strspace;            /* remaining space */
+
+       int             ip_argspace;    /* remaining space of NCARGS limit (argv+envv) */
+       int             ip_strspace;            /* remaining total string space */
+

        user_size_t     ip_arch_offset;         /* subfile offset in ip_vp */
        user_size_t     ip_arch_size;           /* subfile length in ip_vp */
        user_size_t     ip_arch_offset;         /* subfile offset in ip_vp */
        user_size_t     ip_arch_size;           /* subfile length in ip_vp */

-       char            ip_interp_name[IMG_SHSIZE];     /* interpreter name */
+       char            ip_interp_buffer[IMG_SHSIZE];   /* interpreter buffer space */
+       int             ip_interp_sugid_fd;             /* fd for sugid script */

 
        /* Next two fields are for support of architecture translation... */
 
        /* Next two fields are for support of architecture translation... */

-       char            *ip_p_comm;             /* optional alt p->p_comm */

        struct vfs_context      *ip_vfs_context;        /* VFS context */
        struct nameidata *ip_ndp;               /* current nameidata */
        struct vfs_context      *ip_vfs_context;        /* VFS context */
        struct nameidata *ip_ndp;               /* current nameidata */

-       thread_t        ip_vfork_thread;        /* thread created, if vfork */
+       thread_t        ip_new_thread;          /* thread for spawn/vfork */

 
        struct label    *ip_execlabelp;         /* label of the executable */
        struct label    *ip_scriptlabelp;       /* label of the script */
 
        struct label    *ip_execlabelp;         /* label of the executable */
        struct label    *ip_scriptlabelp;       /* label of the script */

+       struct vnode    *ip_scriptvp;           /* script */

        unsigned int    ip_csflags;             /* code signing flags */
        unsigned int    ip_csflags;             /* code signing flags */

-       int             ip_no_trans;            /* allow suid/sgid transition?*/
+       int             ip_mac_return;          /* return code from mac policy checks */

        void            *ip_px_sa;
        void            *ip_px_sfa;
        void            *ip_px_spa;
        void            *ip_px_sa;
        void            *ip_px_sfa;
        void            *ip_px_spa;

+       void            *ip_px_smpx;            /* MAC-specific spawn attrs. */
+       void            *ip_reserved;

 };
 
 /*
  * Image flags
  */
 };
 
 /*
  * Image flags
  */

-#define        IMGPF_NONE      0x00000000              /* No flags */
-#define        IMGPF_INTERPRET 0x00000001              /* Interpreter invoked */
-#define        IMGPF_POWERPC   0x00000002              /* ppc mode for x86 */
-#if CONFIG_EMBEDDED
-#undef IMGPF_POWERPC
-#endif
-#define        IMGPF_WAS_64BIT 0x00000004              /* exec from a 64Bit binary */
-#define        IMGPF_IS_64BIT  0x00000008              /* exec to a 64Bit binary */
+#define        IMGPF_NONE              0x00000000      /* No flags */
+#define        IMGPF_INTERPRET         0x00000001      /* Interpreter invoked */
+#define        IMGPF_RESERVED          0x00000002
+#define        IMGPF_WAS_64BIT         0x00000004      /* exec from a 64Bit binary */
+#define        IMGPF_IS_64BIT          0x00000008      /* exec to a 64Bit binary */
+#define        IMGPF_SPAWN             0x00000010      /* spawn (without setexec) */
+#define        IMGPF_DISABLE_ASLR      0x00000020      /* disable ASLR */
+#define        IMGPF_ALLOW_DATA_EXEC   0x00000040      /* forcibly disallow data execution */
+#define        IMGPF_VFORK_EXEC        0x00000080      /* vfork followed by exec */

 
 #endif /* !_SYS_IMGACT */
 
 #endif /* !_SYS_IMGACT */