blob: 1ba5c1292bd93f1e4cebd12d3964149dfa3a43a9 [file] [log] [blame]
Andrew Geissler595f6302022-01-24 19:11:47 +00001From a6a25e1ecae91f48a4f87bf0cc17eaaf0a919ffe Mon Sep 17 00:00:00 2001
Andrew Geissler635e0e42020-08-21 15:58:33 -05002From: Alex Kiernan <alex.kiernan@gmail.com>
3Date: Fri, 7 Aug 2020 15:20:17 +0000
William A. Kennington IIIac69b482021-06-02 12:28:27 -07004Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un *
Andrew Geissler635e0e42020-08-21 15:58:33 -05005
6| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c: In function 'cant_be_in_netns':
7| ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:4893:25: error: passing argument 2 of 'connect' from incompatible pointer type [-Werror=incompatible-pointer-types]
8| 4893 | if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) {
9| | ^~~~~~
10| | |
11| | struct sockaddr_un *
12| In file included from ../../../../../../workspace/sources/systemd/src/systemd/sd-daemon.h:22,
13| from ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:21:
14| /home/ubuntu/poky/build/tmp/work/core2-64-poky-linux-musl/systemd/1_246-r0/recipe-sysroot/usr/include/sys/socket.h:384:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *'
15| 384 | int connect (int, const struct sockaddr *, socklen_t);
16| | ^~~~~~~~~~~~~~~~~~~~~~~
17| cc1: some warnings being treated as errors
18
19Upstream-Status: Inappropriate [musl specific]
20Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
William A. Kennington IIIac69b482021-06-02 12:28:27 -070021
Andrew Geissler635e0e42020-08-21 15:58:33 -050022---
23 src/nspawn/nspawn.c | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
Andrew Geissler635e0e42020-08-21 15:58:33 -050026--- a/src/nspawn/nspawn.c
27+++ b/src/nspawn/nspawn.c
Andrew Geissler7e0e3c02022-02-25 20:34:39 +000028@@ -5389,7 +5389,7 @@ static int cant_be_in_netns(void) {
Andrew Geissler635e0e42020-08-21 15:58:33 -050029 if (fd < 0)
30 return log_error_errno(errno, "Failed to allocate udev control socket: %m");
31
Andrew Geisslereff27472021-10-29 15:35:00 -050032- if (connect(fd, &sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0) {
33+ if (connect(fd, (struct sockaddr *)&sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0) {
Andrew Geissler635e0e42020-08-21 15:58:33 -050034
35 if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno))
36 return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),