SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23339 from poettering/sockaddr-size-limit

Browse Source 
tree-wide: add support for connecting to AF_UNIX sockets in the file system beyond the 108ch limit
This commit is contained in:
Luca Boccassi
2022-05-21 15:09:04 +01:00
committed by GitHub
parent 051c4e5419 1861986a3b
commit 0168b91603
13 changed files with 123 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-fileio.c
+8 -3
View File
@@ -881,7 +881,7 @@ TEST(read_full_file_socket) {
_cleanup_close_ int listener = -1;
_cleanup_free_ char *data = NULL, *clientname = NULL;
union sockaddr_union sa;
const char *j;
const char *j, *jj;
size_t size;
pid_t pid;
int r;
@@ -897,6 +897,11 @@ TEST(read_full_file_socket) {
assert_se(bind(listener, &sa.sa, SOCKADDR_UN_LEN(sa.un)) >= 0);
assert_se(listen(listener, 1) >= 0);
/* Make sure the socket doesn't fit into a struct sockaddr_un, but we can still access it */
jj = strjoina(z, "/a_very_long_patha_very_long_patha_very_long_patha_very_long_patha_very_long_patha_very_long_patha_very_long_patha_very_long_path");
assert_se(strlen(jj) > sizeof_field(struct sockaddr_un, sun_path));
assert_se(rename(j, jj) >= 0);
/* Bind the *client* socket to some randomized name, to verify that this works correctly. */
assert_se(asprintf(&clientname, "@%" PRIx64 "/test-bindname", random_u64()) >= 0);
@@ -924,8 +929,8 @@ TEST(read_full_file_socket) {
_exit(EXIT_SUCCESS);
}
assert_se(read_full_file_full(AT_FDCWD, j, UINT64_MAX, SIZE_MAX, 0, NULL, &data, &size) == -ENXIO);
assert_se(read_full_file_full(AT_FDCWD, j, UINT64_MAX, SIZE_MAX, READ_FULL_FILE_CONNECT_SOCKET, clientname, &data, &size) >= 0);
assert_se(read_full_file_full(AT_FDCWD, jj, UINT64_MAX, SIZE_MAX, 0, NULL, &data, &size) == -ENXIO);
assert_se(read_full_file_full(AT_FDCWD, jj, UINT64_MAX, SIZE_MAX, READ_FULL_FILE_CONNECT_SOCKET, clientname, &data, &size) >= 0);
assert_se(size == strlen(TEST_STR));
assert_se(streq(data, TEST_STR));