From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 30 Apr 2019 22:36:41 +0000 (+0200)
Subject: seccomp: notifier fixes
X-Git-Tag: lxc-3.0.4~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b0aa99bdf60a7b4b682444ff0166a323e085258;p=thirdparty%2Flxc.git

seccomp: notifier fixes

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
index 328f891f0..d4107eccc 100644
--- a/src/lxc/af_unix.c
+++ b/src/lxc/af_unix.c
@@ -351,18 +351,23 @@ int lxc_unix_connect(struct sockaddr_un *addr)
 	int ret;
 	ssize_t len;
 
-	fd = socket(PF_UNIX, SOCK_STREAM, SOCK_CLOEXEC);
-	if (fd < 0)
+	fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (fd < 0) {
+		SYSERROR("Failed to open new AF_UNIX socket");
 		return -1;
+	}
 
 	if (addr->sun_path[0] == '\0')
 		len = strlen(&addr->sun_path[1]);
 	else
 		len = strlen(&addr->sun_path[0]);
-	ret = connect(fd, (struct sockaddr *)&addr,
-		      offsetof(struct sockaddr_un, sun_path) + len + 1);
-	if (ret < 0)
+
+	ret = connect(fd, (struct sockaddr *)addr,
+		      offsetof(struct sockaddr_un, sun_path) + len);
+	if (ret < 0) {
+		SYSERROR("Failed to bind new AF_UNIX socket");
 		return -1;
+	}
 
 	return move_fd(fd);
 }