From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 2 Dec 2013 22:10:28 +0000 (+0100)
Subject: core: extra paranoia when deserializing kdbus fd
X-Git-Tag: v209~1153
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8bf9fcf48853021ac713d7675b89143e4e8b1ce5;p=elogind.git

core: extra paranoia when deserializing kdbus fd
---

diff --git a/src/core/manager.c b/src/core/manager.c
index badf19e95..19493861e 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2172,7 +2172,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
                 } else if (startswith(l, "kdbus-fd=")) {
                         int fd;
 
-                        if (safe_atoi(l + 9, &fd) < 0 || !fdset_contains(fds, fd))
+                        if (safe_atoi(l + 9, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd))
                                 log_debug("Failed to parse kdbus fd: %s", l + 9);
                         else {
                                 if (m->kdbus_fd >= 0)