Fix undefined behavior on rmi

Change-Id: I4a4471e9c42ecbbd98b7a7a4c1664be8a226e66c
Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/include/klay/rmi/message.h b/include/klay/rmi/message.h
index 52d156907eb74ab324e795bc4e3b96b7c7093420..5285a815b289cdf0b2bf2ea460390e97b1fdcf6a 100644 (file)
--- a/include/klay/rmi/message.h
+++ b/include/klay/rmi/message.h
@@ -21,6 +21,7 @@
 #include <string>
 #include <memory>
 #include <atomic>
+#include <vector>
 
 #include <klay/klay.h>
 #include <klay/serialize.h>
@@ -209,9 +210,9 @@ void Message::encode(const T& device) const
        device.write(&header, sizeof(header));
        device.write(buffer.begin(), header.length);
 
-       int i = 0, fds[fileDescriptors.size()];
+       std::vector<int> fds;
        for (const klay::FileDescriptor& fd : fileDescriptors) {
-               fds[i++] = fd.fileDescriptor;
+               fds.push_back(fd.fileDescriptor);
        }
 
        device.sendFileDescriptors(fds, fileDescriptors.size());
@@ -225,12 +226,10 @@ void Message::decode(const T& device)
        buffer.reserve(header.length);
        device.read(buffer.begin(), header.length);
 
-       int fds[header.ancillary];
-
+       std::vector<int> fds;
        device.receiveFileDescriptors(fds, header.ancillary);
-       for (unsigned int i = 0; i < header.ancillary; i++) {
-               fileDescriptors.emplace_back(klay::FileDescriptor(fds[i]));
-       }
+       for (const auto& fd : fds)
+               fileDescriptors.emplace_back(klay::FileDescriptor(fd));
 
        disclose(signature);
 }

diff --git a/include/klay/rmi/socket.h b/include/klay/rmi/socket.h
index e8812066c6cc287b56d521b2b52b222e637f967a..606a106fe43c99b60a037eca38c671a53e8d03ab 100644 (file)
--- a/include/klay/rmi/socket.h
+++ b/include/klay/rmi/socket.h
@@ -20,6 +20,8 @@
 #include <klay/klay.h>
 #include <klay/exception.h>
 
+#include <vector>
+
 namespace klay {
 namespace rmi {
 
@@ -52,8 +54,8 @@ public:
        void write(const void* buffer, const size_t size) const;
        void read(void* buffer, const size_t size) const;
 
-       void sendFileDescriptors(const int* fds, const size_t nr) const;
-       void receiveFileDescriptors(int* fds, const size_t nr) const;
+       void sendFileDescriptors(const std::vector<int>& fds, const size_t nr) const;
+       void receiveFileDescriptors(std::vector<int>& fds, const size_t nr) const;
 
        static Socket create(const std::string& path, bool activation = false);
        static Socket connect(const std::string& path);

diff --git a/src/rmi/socket.cpp b/src/rmi/socket.cpp
index 9889acbd652c4e185855ef667b8ca050d46f9530..73704737f490ce3dcd45e2990f86e8eb523685ed 100644 (file)
--- a/src/rmi/socket.cpp
+++ b/src/rmi/socket.cpp
@@ -135,7 +135,7 @@ void Socket::write(const void *buffer, const size_t size) const
        }
 }
 
-void Socket::sendFileDescriptors(const int* fds, const size_t nr) const
+void Socket::sendFileDescriptors(const std::vector<int>& fds, const size_t nr) const
 {
        if (nr == 0) return;
 
@@ -156,13 +156,14 @@ void Socket::sendFileDescriptors(const int* fds, const size_t nr) const
        msgh.msg_control = buffer;
        msgh.msg_controllen = sizeof(buffer);
 
-       struct cmsghdr *cmhp;
-       cmhp = CMSG_FIRSTHDR(&msgh);
+       struct cmsghdr *cmhp = CMSG_FIRSTHDR(&msgh);
+       if (cmhp == nullptr)
+               throw SocketException("There isn't enough space for a cmsghdr.");
        cmhp->cmsg_level = SOL_SOCKET;
        cmhp->cmsg_type = SCM_RIGHTS;
        cmhp->cmsg_len = CMSG_LEN(sizeof(int) * nr);
 
-       ::memcpy(CMSG_DATA(cmhp), fds, sizeof(int) * nr);
+       ::memcpy(CMSG_DATA(cmhp), fds.data(), sizeof(int) * nr);
 
        int written = 0;
        while (written < 1) {
@@ -175,7 +176,7 @@ void Socket::sendFileDescriptors(const int* fds, const size_t nr) const
        }
 }
 
-void Socket::receiveFileDescriptors(int* fds, const size_t nr) const
+void Socket::receiveFileDescriptors(std::vector<int>& fds, const size_t nr) const
 {
        if (nr == 0) return;
 
@@ -208,14 +209,13 @@ void Socket::receiveFileDescriptors(int* fds, const size_t nr) const
                }
        }
 
-       int i = 0;
        for (struct cmsghdr *cmhp = CMSG_FIRSTHDR(&msgh); cmhp != NULL; cmhp = CMSG_NXTHDR(&msgh, cmhp)) {
                if ((cmhp->cmsg_level == SOL_SOCKET) && (cmhp->cmsg_type == SCM_RIGHTS)) {
                        if (cmhp->cmsg_len != CMSG_LEN(sizeof(int) * nr)) {
                                std::cout << "Invalid File Descriptor Table" << std::endl;
                        }
 
-                       fds[i++] = *(reinterpret_cast<int*>(CMSG_DATA(cmhp)));
+                       fds.push_back(*(reinterpret_cast<int*>(CMSG_DATA(cmhp))));
                }
        }
 }