xnu-3789.51.2.tar.gz

[apple/xnu.git] / bsd / security / audit / audit_arg.c

diff --git a/bsd/security/audit/audit_arg.c b/bsd/security/audit/audit_arg.c
index 19ba08a5758b09a340cfc9c599b7665262f6a1ac..71f3e0716a5e1d27cb6bb9f8a9532ca1c2f221fb 100644 (file)
--- a/bsd/security/audit/audit_arg.c
+++ b/bsd/security/audit/audit_arg.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1999-2012 Apple Inc.
+ * Copyright (c) 1999-2016 Apple Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -75,8 +75,6 @@
 #include <kern/host.h>
 #include <kern/kalloc.h>
 #include <kern/zalloc.h>
-#include <kern/lock.h>
-#include <kern/wait_queue.h>
 #include <kern/sched_prim.h>
 
 #if CONFIG_MACF
@@ -136,6 +134,14 @@ audit_arg_len(struct kaudit_record *ar, user_size_t len)
        ARG_SET_VALID(ar, ARG_LEN);
 }
 
+void
+audit_arg_fd2(struct kaudit_record *ar, int fd)
+{
+
+       ar->k_ar.ar_arg_fd2 = fd;
+       ARG_SET_VALID(ar, ARG_FD2);
+}
+
 void
 audit_arg_fd(struct kaudit_record *ar, int fd)
 {
@@ -348,7 +354,6 @@ void
 audit_arg_sockaddr(struct kaudit_record *ar, struct vnode *cwd_vp,
     struct sockaddr *sa)
 {
-       int slen;
        struct sockaddr_un *sun;
        char path[SOCK_MAXADDRLEN - offsetof(struct sockaddr_un, sun_path) + 1];
 
@@ -357,7 +362,11 @@ audit_arg_sockaddr(struct kaudit_record *ar, struct vnode *cwd_vp,
        if (cwd_vp == NULL || sa == NULL)
                return;
 
-       bcopy(sa, &ar->k_ar.ar_arg_sockaddr, sa->sa_len);
+       if (sa->sa_len > sizeof(ar->k_ar.ar_arg_sockaddr))
+               bcopy(sa, &ar->k_ar.ar_arg_sockaddr, sizeof(ar->k_ar.ar_arg_sockaddr));
+       else
+               bcopy(sa, &ar->k_ar.ar_arg_sockaddr, sa->sa_len);
+
        switch (sa->sa_family) {
        case AF_INET:
                ARG_SET_VALID(ar, ARG_SADDRINET);
@@ -369,20 +378,12 @@ audit_arg_sockaddr(struct kaudit_record *ar, struct vnode *cwd_vp,
 
        case AF_UNIX:
                sun = (struct sockaddr_un *)sa;
-               slen = sun->sun_len - offsetof(struct sockaddr_un, sun_path);
-
-               if (slen >= 0) {
+               if (sun->sun_len > offsetof(struct sockaddr_un, sun_path)) {
                        /*
                         * Make sure the path is NULL-terminated
                         */
-                       if (sun->sun_path[slen] != 0) {
-                               bcopy(sun->sun_path, path, slen);
-                               path[slen] = 0;
-                               audit_arg_upath(ar, cwd_vp, path, ARG_UPATH1);
-                       } else {
-                               audit_arg_upath(ar, cwd_vp, sun->sun_path, 
-                                       ARG_UPATH1);
-                       }
+                       strlcpy(path, sun->sun_path, sizeof(path));
+                       audit_arg_upath(ar, cwd_vp, path, ARG_UPATH1);
                }
                ARG_SET_VALID(ar, ARG_SADDRUNIX);
                break;