xnu-4570.51.1.tar.gz

[apple/xnu.git] / bsd / kern / sys_generic.c

diff --git a/bsd/kern/sys_generic.c b/bsd/kern/sys_generic.c
index 2d1431763c7c23d2bce4e28d18f4f9386c3641a3..9cfbe7e9176d473723d6898c581d857b6dead11f 100644 (file)
--- a/bsd/kern/sys_generic.c
+++ b/bsd/kern/sys_generic.c
@@ -97,6 +97,7 @@
 #include <sys/proc.h>
 #include <sys/kauth.h>
 
+#include <machine/smp.h>
 #include <mach/mach_types.h>
 #include <kern/kern_types.h>
 #include <kern/assert.h>
@@ -140,6 +141,10 @@
 #include <kern/kalloc.h>
 #include <sys/vnode_internal.h>
 
+#if CONFIG_MACF
+#include <security/mac_framework.h>
+#endif
+
 /* XXX should be in a header file somewhere */
 void evsofree(struct socket *);
 void evpipefree(struct pipe *);
@@ -159,7 +164,6 @@ __private_extern__ int      dofilewrite(vfs_context_t ctx, struct fileproc *fp,
 __private_extern__ int preparefileread(struct proc *p, struct fileproc **fp_ret, int fd, int check_for_vnode);
 __private_extern__ void        donefileread(struct proc *p, struct fileproc *fp_ret, int fd);
 
-
 /* Conflict wait queue for when selects collide (opaque type) */
 struct waitq select_conflict_queue;
 
@@ -770,7 +774,7 @@ ioctl(struct proc *p, struct ioctl_args *uap, __unused int32_t *retval)
        boolean_t is64bit = FALSE;
        int tmp = 0;
 #define STK_PARAMS     128
-       char stkbuf[STK_PARAMS];
+       char stkbuf[STK_PARAMS] = {};
        int fd = uap->fd;
        u_long com = uap->com;
        struct vfs_context context = *vfs_context_current();
@@ -3111,6 +3115,14 @@ gethostuuid(struct proc *p, struct gethostuuid_args *uap, __unused int32_t *retv
        __darwin_uuid_t uuid_kern;      /* for IOKit call */
 
        if (!uap->spi) {
+#if CONFIG_EMBEDDED
+#if CONFIG_MACF
+               if ((error = mac_system_check_info(kauth_cred_get(), "hw.uuid")) != 0) {
+                       /* EPERM invokes userspace upcall if present */
+                       return (error);
+               }
+#endif
+#endif
        }
 
        /* Convert the 32/64 bit timespec into a mach_timespec_t */
@@ -3289,7 +3301,7 @@ telemetry(__unused struct proc *p, struct telemetry_args *args, __unused int32_t
        return (error);
 }
 
-#if defined(DEVELOPMENT) || defined(DEBUG)
+#if DEVELOPMENT || DEBUG
 #if CONFIG_WAITQ_DEBUG
 static uint64_t g_wqset_num = 0;
 struct g_wqset {
@@ -3669,4 +3681,6 @@ SYSCTL_PROC(_kern, OID_AUTO, wqset_clear_preposts, CTLTYPE_QUAD | CTLFLAG_RW | C
            0, 0, sysctl_wqset_clear_preposts, "Q", "clear preposts on given waitq set");
 
 #endif /* CONFIG_WAITQ_DEBUG */
-#endif /* defined(DEVELOPMENT) || defined(DEBUG) */
+#endif /* DEVELOPMENT || DEBUG */
+
+