[v2,1/2] tests: add a (failing) test for standalone unix sockets

Submitted by Tycho Andersen on June 29, 2016, 1:23 a.m.

Details

Message ID 1467163386-11266-1-git-send-email-tycho.andersen@canonical.com
State Rejected
Series "Series without cover letter"
Headers show

Commit Message

Tycho Andersen June 29, 2016, 1:23 a.m.
v2: open two sockets, one "on top" of the other

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
---
 test/zdtm/.gitignore                          |   1 +
 test/zdtm/static/Makefile                     |   1 +
 test/zdtm/static/deleted_standalone_unix.c    | 134 ++++++++++++++++++++++++++
 test/zdtm/static/deleted_standalone_unix.desc |   1 +
 4 files changed, 137 insertions(+)
 create mode 100644 test/zdtm/static/deleted_standalone_unix.c
 create mode 100644 test/zdtm/static/deleted_standalone_unix.desc

Patch hide | download patch | download mbox

diff --git a/test/zdtm/.gitignore b/test/zdtm/.gitignore
index 85e39a2..4864731 100644
--- a/test/zdtm/.gitignore
+++ b/test/zdtm/.gitignore
@@ -28,6 +28,7 @@ 
 /static/cwd01
 /static/cwd02
 /static/deleted_dev
+/static/deleted_standalone_unix
 /static/deleted_unix_sock
 /static/different_creds
 /static/dumpable01
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 3da7e3b..68d81b2 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -245,6 +245,7 @@  TST_DIR		=				\
 		mnt_enablefs			\
 		autofs				\
 		mnt_enablefs			\
+		deleted_standalone_unix		\
 
 TST_DIR_FILE	=				\
 		chroot				\
diff --git a/test/zdtm/static/deleted_standalone_unix.c b/test/zdtm/static/deleted_standalone_unix.c
new file mode 100644
index 0000000..b44e4bc
--- /dev/null
+++ b/test/zdtm/static/deleted_standalone_unix.c
@@ -0,0 +1,134 @@ 
+#define _GNU_SOURCE
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+#include <stdbool.h>
+#include <limits.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check that deleted unix sockets are restored correctly";
+const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+
+char *dirname;
+TEST_OPTION(dirname, string, "directory name", 1);
+
+static int fill_sock_name(struct sockaddr_un *name, const char *filename)
+{
+	char *cwd;
+
+	cwd = get_current_dir_name();
+	if (strlen(filename) + strlen(cwd) + 1 >= sizeof(name->sun_path))
+		return -1;
+
+	name->sun_family = AF_LOCAL;
+	sprintf(name->sun_path, "%s/%s", cwd, filename);
+	return 0;
+}
+
+static int bind_and_maybe_delete(struct sockaddr_un *addr, bool delete)
+{
+	int sk;
+
+	sk = socket(PF_UNIX, SOCK_STREAM, 0);
+	if (sk < 0) {
+		fail("socket");
+		return -1;
+	}
+
+	test_msg("family: %d\n", addr->sun_family);
+	if (bind(sk, addr, sizeof(*addr))) {
+		fail("bind %s", addr->sun_path);
+		close(sk);
+		return -1;
+	}
+
+	if (listen(sk, 1)) {
+		fail("listen");
+		close(sk);
+		return -1;
+	}
+
+	if (delete && unlink(addr->sun_path) < 0) {
+		fail("unlink");
+		close(sk);
+		return -1;
+	}
+
+	return sk;
+}
+
+int main(int argc, char **argv)
+{
+	struct sockaddr_un addr;
+	int sk1 = -1, sk2 = -1, ret = 1;
+	struct stat sb;
+	char filename[PATH_MAX], temp[PATH_MAX];
+
+	test_init(argc, argv);
+
+	sprintf(filename, "%s/sock", dirname);
+	sprintf(temp, "%s/temp", dirname);
+
+	if (mkdir(dirname, 0755) < 0) {
+		fail("mkdir");
+		goto out;
+	}
+
+	if (fill_sock_name(&addr, filename) < 0) {
+		pr_err("filename \"%s\" is too long", filename);
+		goto out;
+	}
+
+	sk1 = bind_and_maybe_delete(&addr, false);
+	if (sk1 < 0)
+		goto out;
+
+	test_msg("bound first\n");
+
+	if (rename(filename, temp) < 0) {
+		fail("rename");
+		goto out;
+	}
+
+	sk2 = bind_and_maybe_delete(&addr, true);
+	if (sk2 < 0)
+		goto out;
+
+	if (rename(temp, filename) < 0) {
+		fail("rename2");
+		goto out;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (getsockopt(sk1, 0, 0, NULL, 0) && errno != EOPNOTSUPP) {
+		fail("socket 1 didn't survive restore");
+		goto out;
+	}
+
+	if (getsockopt(sk2, 0, 0, NULL, 0) && errno != EOPNOTSUPP) {
+		fail("socket 2 didn't survive restore");
+		goto out;
+	}
+
+	if (stat(addr.sun_path, &sb) != 0) {
+		fail("%s doesn't exist after restore\n", addr.sun_path);
+		goto out;
+	}
+
+	pass();
+	ret = 0;
+out:
+	if (sk1 > 0)
+		close(sk1);
+	if (sk2 > 0)
+		close(sk2);
+	rmdir(dirname);
+	return ret;
+}
diff --git a/test/zdtm/static/deleted_standalone_unix.desc b/test/zdtm/static/deleted_standalone_unix.desc
new file mode 100644
index 0000000..289362e
--- /dev/null
+++ b/test/zdtm/static/deleted_standalone_unix.desc
@@ -0,0 +1 @@ 
+{'flavor': 'h ns uns'}