From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 May 2024 21:33:38 +0000 (+0200)
Subject: socket-util: make return parameter for socket_address_parse_vsock() optional
X-Git-Tag: v257-rc1~1145^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59c8110ac6dc966583736fb4327fecc60c255906;p=thirdparty%2Fsystemd.git

socket-util: make return parameter for socket_address_parse_vsock() optional
---

diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 6e304e840d2..5849799f05d 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -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;