From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 30 Mar 2013 14:19:22 +0000 (+0100)
Subject: bus: if we recieve fds but fd passing is off, consider this an error
X-Git-Tag: v201~135
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5384d4b3d76424a466fe54da744dca8711ffa60f;hp=0f4b73c8d379183678d5b99cf235f24c8ebd32f3;p=elogind.git

bus: if we recieve fds but fd passing is off, consider this an error
---

diff --git a/src/libsystemd-bus/bus-socket.c b/src/libsystemd-bus/bus-socket.c
index 9512d2e31..de823d582 100644
--- a/src/libsystemd-bus/bus-socket.c
+++ b/src/libsystemd-bus/bus-socket.c
@@ -542,6 +542,15 @@ int bus_socket_read_message(sd_bus *bus, sd_bus_message **m) {
 
                         n = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int);
 
+                        if (!bus->can_fds) {
+                                /* Whut? We received fds but this
+                                 * isn't actually enabled? Close them,
+                                 * and fail */
+
+                                close_many((int*) CMSG_DATA(cmsg), n);
+                                return -EIO;
+                        }
+
                         f = realloc(bus->fds, sizeof(int) + (bus->n_fds + n));
                         if (!f) {
                                 close_many((int*) CMSG_DATA(cmsg), n);