1
=== modified file 'src/common/fd/fd_socket_transmission.cpp'
2
--- src/common/fd/fd_socket_transmission.cpp	2014-10-22 15:43:57 +0000
3
+++ src/common/fd/fd_socket_transmission.cpp	2014-11-20 18:49:22 +0000
4
@@ -148,18 +148,24 @@
5
148
        struct cmsghdr const* const cmsg = CMSG_FIRSTHDR(&header);
148
        struct cmsghdr const* const cmsg = CMSG_FIRSTHDR(&header);
6
149
        if (cmsg)
149
        if (cmsg)
7
150
        {
150
        {
8
151
            // NOTE: This relies on the file descriptor cmsg being read
9
152
            // (and written) atomically.
10
153
            if (cmsg->cmsg_len > CMSG_LEN(fds_bytes) || (header.msg_flags & MSG_CTRUNC))
11
154
                BOOST_THROW_EXCEPTION(std::runtime_error("Received more fds than expected"));
12
155
            if ((cmsg->cmsg_level == SOL_SOCKET) && (cmsg->cmsg_type == SCM_CREDENTIALS))
151
            if ((cmsg->cmsg_level == SOL_SOCKET) && (cmsg->cmsg_type == SCM_CREDENTIALS))
13
156
                BOOST_THROW_EXCEPTION(fd_reception_error("received SCM_CREDENTIALS when expecting fd"));
152
                BOOST_THROW_EXCEPTION(fd_reception_error("received SCM_CREDENTIALS when expecting fd"));
14
157
            if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS)
153
            if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS)
15
158
                BOOST_THROW_EXCEPTION(fd_reception_error("Invalid control message for receiving file descriptors"));
154
                BOOST_THROW_EXCEPTION(fd_reception_error("Invalid control message for receiving file descriptors"));
16
155
17
159
            int const* const data = reinterpret_cast<int const*>CMSG_DATA(cmsg);
156
            int const* const data = reinterpret_cast<int const*>CMSG_DATA(cmsg);
18
160
            ptrdiff_t const header_size = reinterpret_cast<char const*>(data) - reinterpret_cast<char const*>(cmsg);
157
            ptrdiff_t const header_size = reinterpret_cast<char const*>(data) - reinterpret_cast<char const*>(cmsg);
19
161
            int const nfds = (cmsg->cmsg_len - header_size) / sizeof(int);
158
            int const nfds = (cmsg->cmsg_len - header_size) / sizeof(int);
20
162
159
21
160
            // NOTE: This relies on the file descriptor cmsg being read
22
161
            // (and written) atomically.
23
162
            if (cmsg->cmsg_len > CMSG_LEN(fds_bytes) || (header.msg_flags & MSG_CTRUNC))
24
163
            {
25
164
                for (int i = 0; i < nfds; i++)
26
165
                    ::close(data[i]);
27
166
                BOOST_THROW_EXCEPTION(std::runtime_error("Received more fds than expected"));
28
167
            }
29
168
30
163
            // We can't properly pass mir::Fds through google::protobuf::Message,
169
            // We can't properly pass mir::Fds through google::protobuf::Message,
31
164
            // which is where these get shoved.
170
            // which is where these get shoved.
32
165
            //
171
            //
33
@@ -173,5 +179,11 @@
34
173
    }
179
    }
35
174
180
36
175
    if (fds_read < fds.size())
181
    if (fds_read < fds.size())
38
176
        BOOST_THROW_EXCEPTION(std::runtime_error("Receieved fewer fds than expected"));
182
    {
39
183
        for (auto fd : fds)
40
184
            if (fd >= 0)
41
185
                ::close(fd);
42
186
        fds.clear();
43
187
        BOOST_THROW_EXCEPTION(std::runtime_error("Received fewer fds than expected"));
44
188
    }
45
177
}
189
}
Reviewer	Review Type	Date Requested	Status
Alberto Aguirre (community)			Approve on 2014-11-20
Alan Griffiths			Approve on 2014-11-20
PS Jenkins bot (community)	continuous-integration		Approve on 2014-11-20
Alexandros Frantzis (community)		2014-11-19	Approve on 2014-11-20
Review via email: mp+242276@code.launchpad.net