Security-59306.61.1.tar.gz

[apple/security.git] / securityd / src / SharedMemoryServer.cpp

diff --git a/securityd/src/SharedMemoryServer.cpp b/securityd/src/SharedMemoryServer.cpp
index 3b95482bd6e6602f33d23aacee4c5dd53efb4699..60176b1b7e2d182b36314268adab519dae24b8ef 100644 (file)
--- a/securityd/src/SharedMemoryServer.cpp
+++ b/securityd/src/SharedMemoryServer.cpp
@@ -32,25 +32,13 @@
 #include <security_utilities/crc.h>
 #include <security_utilities/casts.h>
 #include <unistd.h>
 #include <security_utilities/crc.h>
 #include <security_utilities/casts.h>
 #include <unistd.h>

+#include <vector>

 
 /*
     Logically, these should go in /var/run/mds, but we know that /var/db/mds
     already exists at install time.
 */
 
 
 /*
     Logically, these should go in /var/run/mds, but we know that /var/db/mds
     already exists at install time.
 */
 

-std::string SharedMemoryCommon::SharedMemoryFilePath(const char *segmentName, uid_t uid) {
-    std::string path;
-    uid = SharedMemoryCommon::fixUID(uid);
-    path = SharedMemoryCommon::kMDSMessagesDirectory;   // i.e. /private/var/db/mds/messages/
-    if (uid != 0) {
-        path += std::to_string(uid) + "/";              // e.g. /private/var/db/mds/messages/501/
-    }
-
-    path += SharedMemoryCommon::kUserPrefix;            // e.g. /var/db/mds/messages/se_
-    path += segmentName;                                // e.g. /var/db/mds/messages/501/se_SecurityMessages
-    return path;
-}
-

 static bool makedir(const char *path, mode_t mode) {
     // Returns true on success. Primarily to centralize logging
     if (::mkdir(path, mode)==0 || errno==EEXIST) {
 static bool makedir(const char *path, mode_t mode) {
     // Returns true on success. Primarily to centralize logging
     if (::mkdir(path, mode)==0 || errno==EEXIST) {


@@ -166,13 +154,13 @@ void SharedMemoryServer::WriteMessage (SegmentOffsetType domain, SegmentOffsetTy
 
        // assemble the final message
        ssize_t messageSize = kHeaderLength + messageLength;
 
        // assemble the final message
        ssize_t messageSize = kHeaderLength + messageLength;

-       u_int8_t finalMessage[messageSize];
-       SegmentOffsetType *fm  = (SegmentOffsetType*) finalMessage;
+       std::vector<u_int8_t> finalMessage(messageSize);
+       SegmentOffsetType *fm  = (SegmentOffsetType*) finalMessage.data();

        fm[0] = OSSwapHostToBigInt32(domain);
        fm[1] = OSSwapHostToBigInt32(event);
        memcpy(&fm[2], message, messageLength);
        
        fm[0] = OSSwapHostToBigInt32(domain);
        fm[1] = OSSwapHostToBigInt32(event);
        memcpy(&fm[2], message, messageLength);
        

-       SegmentOffsetType crc = CalculateCRC(finalMessage, messageSize);
+       SegmentOffsetType crc = CalculateCRC(finalMessage.data(), messageSize);

        
        // write the length
        WriteOffset(int_cast<size_t, SegmentOffsetType>(messageSize));
        
        // write the length
        WriteOffset(int_cast<size_t, SegmentOffsetType>(messageSize));


@@ -181,7 +169,7 @@ void SharedMemoryServer::WriteMessage (SegmentOffsetType domain, SegmentOffsetTy
        WriteOffset(crc);
        
        // write the data
        WriteOffset(crc);
        
        // write the data

-       WriteData (finalMessage, int_cast<size_t, SegmentOffsetType>(messageSize));
+       WriteData (finalMessage.data(), int_cast<size_t, SegmentOffsetType>(messageSize));

        
        // write the data count
        SetProducerOffset(int_cast<size_t, SegmentOffsetType>(mDataPtr - mDataArea));
        
        // write the data count
        SetProducerOffset(int_cast<size_t, SegmentOffsetType>(mDataPtr - mDataArea));