Security-58286.240.4.tar.gz

[apple/security.git] / OSX / libsecurity_utilities / lib / machserver.cpp

diff --git a/OSX/libsecurity_utilities/lib/machserver.cpp b/OSX/libsecurity_utilities/lib/machserver.cpp
index 8f825ba2ae1265944bc65c91d6e60240827c06c9..29ffa83a3c97936646451b291667abb3192e464b 100644 (file)
--- a/OSX/libsecurity_utilities/lib/machserver.cpp
+++ b/OSX/libsecurity_utilities/lib/machserver.cpp
@@ -40,6 +40,8 @@
 # include <sys/time.h>
 #endif
 
 # include <sys/time.h>
 #endif
 

+#define SEC_MACH_AUDIT_TOKEN_PID (5)
+

 namespace Security {
 namespace MachPlusPlus {
 
 namespace Security {
 namespace MachPlusPlus {
 


@@ -245,6 +247,11 @@ void MachServer::runServerThread(bool doTimeout)
                                bufRequest.msgId() <= MACH_NOTIFY_LAST) {
                                // mach kernel notification message
                                // we assume this is quick, so no thread arbitration here
                                bufRequest.msgId() <= MACH_NOTIFY_LAST) {
                                // mach kernel notification message
                                // we assume this is quick, so no thread arbitration here

+                               mach_msg_audit_trailer_t *tlr = bufRequest.auditTrailer();
+                               if (tlr == NULL || tlr->msgh_audit.val[SEC_MACH_AUDIT_TOKEN_PID] != 0) {
+                                       secnotice("machserver", "ignoring invalid notify message");
+                                       continue;
+                               }

                                cdsa_notify_server(bufRequest, bufReply);
                        } else {
                                // normal request message
                                cdsa_notify_server(bufRequest, bufReply);
                        } else {
                                // normal request message