]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shared: ignore invalid valink socket fd when deserializing
authorFrantisek Sumsal <frantisek@sumsal.cz>
Tue, 2 May 2023 20:36:59 +0000 (22:36 +0200)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Wed, 3 May 2023 08:09:53 +0000 (10:09 +0200)
src/shared/varlink.c
test/fuzz/fuzz-manager-serialize/crash-4a3d5bed0213b88d06d6f20e7af44a02daf28961 [new file with mode: 0644]

index 6b985a4c9b32fcdb3f08ea4ed07160efc51b16a9..808e2b2dbabf942c6fda0cf073056841e140d6f8 100644 (file)
@@ -3063,7 +3063,9 @@ int varlink_server_deserialize_one(VarlinkServer *s, const char *value, FDSet *f
         r = safe_atoi(buf, &fd);
         if (r < 0)
                 return log_debug_errno(r, "Unable to parse VarlinkServerSocket varlink-server-socket-fd=%s: %m", buf);
-
+        if (fd < 0)
+                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "VarlinkServerSocket varlink-server-socket-fd= has an invalid value: %d", fd);
         if (!fdset_contains(fds, fd))
                 return log_debug_errno(SYNTHETIC_ERRNO(EBADF),
                                        "VarlinkServerSocket varlink-server-socket-fd= has unknown fd %d: %m", fd);
diff --git a/test/fuzz/fuzz-manager-serialize/crash-4a3d5bed0213b88d06d6f20e7af44a02daf28961 b/test/fuzz/fuzz-manager-serialize/crash-4a3d5bed0213b88d06d6f20e7af44a02daf28961
new file mode 100644 (file)
index 0000000..724c85a
--- /dev/null
@@ -0,0 +1,5 @@
+current-jobda90d3313a435b56a7-dbus-broker.service-enN2wt
+varlink-server-socket-address=/run/systemd/is.oystem.ManagedOOM varlink-server-socket-fd=-3
+varlink-server-socket-address=/run/systemd/userdb/io.systemd.DynamicUsr varlink-server-socket-fd=44
+
+systemd-udevd-co~ntrassert-timestamp=1682967574856rted-