]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
socket-util: make return parameter for socket_address_parse_vsock() optional
authorLennart Poettering <lennart@poettering.net>
Thu, 23 May 2024 21:33:38 +0000 (23:33 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 14 Jun 2024 09:12:56 +0000 (11:12 +0200)
src/basic/socket-util.c

index 6e304e840d2da498e198984c122417478f1377c7..5849799f05d3432d7f9d7855317a1dde3cd19410 100644 (file)
@@ -1757,13 +1757,12 @@ int socket_address_parse_vsock(SocketAddress *ret_address, const char *s) {
 int vsock_get_local_cid(unsigned *ret) {
         _cleanup_close_ int vsock_fd = -EBADF;
 
-        assert(ret);
-
         vsock_fd = open("/dev/vsock", O_RDONLY|O_CLOEXEC);
         if (vsock_fd < 0)
                 return log_debug_errno(errno, "Failed to open /dev/vsock: %m");
 
-        if (ioctl(vsock_fd, IOCTL_VM_SOCKETS_GET_LOCAL_CID, ret) < 0)
+        unsigned tmp;
+        if (ioctl(vsock_fd, IOCTL_VM_SOCKETS_GET_LOCAL_CID, ret ?: &tmp) < 0)
                 return log_debug_errno(errno, "Failed to query local AF_VSOCK CID: %m");
 
         return 0;