f12b86c0d6
This patch fixes a build error reported in the link. [0]
unix_connect.c: In function ‘unix_connect_test’:
unix_connect.c:115:55: error: expected identifier before ‘(’ token
#define offsetof(type, member) ((size_t)&((type *)0)->(member))
^
unix_connect.c:128:12: note: in expansion of macro ‘offsetof’
addrlen = offsetof(struct sockaddr_un, sun_path) + variant->len;
^~~~~~~~
We can fix this by removing () around member, but checkpatch will complain
about it, and the root cause of the build failure is that I followed the
warning and fixed this in the v2 -> v3 change of the blamed commit. [1]
CHECK: Macro argument 'member' may be better as '(member)' to avoid precedence issues
#33: FILE: tools/testing/selftests/net/af_unix/unix_connect.c:115:
+#define offsetof(type, member) ((size_t)&((type *)0)->member)
To avoid this warning, let's use offsetof() defined in stddef.h instead.
[0]: https://lore.kernel.org/linux-mm/202207182205.FrkMeDZT-lkp@intel.com/
[1]: https://lore.kernel.org/netdev/20220702154818.66761-1-kuniyu@amazon.com/
Fixes: e95ab1d852 ("selftests: net: af_unix: Test connect() with different netns.")
Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20220720005750.16600-1-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
148 lines
2.5 KiB
C
148 lines
2.5 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#define _GNU_SOURCE
|
|
#include <sched.h>
|
|
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
|
|
#include <sys/socket.h>
|
|
#include <sys/un.h>
|
|
|
|
#include "../../kselftest_harness.h"
|
|
|
|
FIXTURE(unix_connect)
|
|
{
|
|
int server, client;
|
|
int family;
|
|
};
|
|
|
|
FIXTURE_VARIANT(unix_connect)
|
|
{
|
|
int type;
|
|
char sun_path[8];
|
|
int len;
|
|
int flags;
|
|
int err;
|
|
};
|
|
|
|
FIXTURE_VARIANT_ADD(unix_connect, stream_pathname)
|
|
{
|
|
.type = SOCK_STREAM,
|
|
.sun_path = "test",
|
|
.len = 4 + 1,
|
|
.flags = 0,
|
|
.err = 0,
|
|
};
|
|
|
|
FIXTURE_VARIANT_ADD(unix_connect, stream_abstract)
|
|
{
|
|
.type = SOCK_STREAM,
|
|
.sun_path = "\0test",
|
|
.len = 5,
|
|
.flags = 0,
|
|
.err = 0,
|
|
};
|
|
|
|
FIXTURE_VARIANT_ADD(unix_connect, stream_pathname_netns)
|
|
{
|
|
.type = SOCK_STREAM,
|
|
.sun_path = "test",
|
|
.len = 4 + 1,
|
|
.flags = CLONE_NEWNET,
|
|
.err = 0,
|
|
};
|
|
|
|
FIXTURE_VARIANT_ADD(unix_connect, stream_abstract_netns)
|
|
{
|
|
.type = SOCK_STREAM,
|
|
.sun_path = "\0test",
|
|
.len = 5,
|
|
.flags = CLONE_NEWNET,
|
|
.err = ECONNREFUSED,
|
|
};
|
|
|
|
FIXTURE_VARIANT_ADD(unix_connect, dgram_pathname)
|
|
{
|
|
.type = SOCK_DGRAM,
|
|
.sun_path = "test",
|
|
.len = 4 + 1,
|
|
.flags = 0,
|
|
.err = 0,
|
|
};
|
|
|
|
FIXTURE_VARIANT_ADD(unix_connect, dgram_abstract)
|
|
{
|
|
.type = SOCK_DGRAM,
|
|
.sun_path = "\0test",
|
|
.len = 5,
|
|
.flags = 0,
|
|
.err = 0,
|
|
};
|
|
|
|
FIXTURE_VARIANT_ADD(unix_connect, dgram_pathname_netns)
|
|
{
|
|
.type = SOCK_DGRAM,
|
|
.sun_path = "test",
|
|
.len = 4 + 1,
|
|
.flags = CLONE_NEWNET,
|
|
.err = 0,
|
|
};
|
|
|
|
FIXTURE_VARIANT_ADD(unix_connect, dgram_abstract_netns)
|
|
{
|
|
.type = SOCK_DGRAM,
|
|
.sun_path = "\0test",
|
|
.len = 5,
|
|
.flags = CLONE_NEWNET,
|
|
.err = ECONNREFUSED,
|
|
};
|
|
|
|
FIXTURE_SETUP(unix_connect)
|
|
{
|
|
self->family = AF_UNIX;
|
|
}
|
|
|
|
FIXTURE_TEARDOWN(unix_connect)
|
|
{
|
|
close(self->server);
|
|
close(self->client);
|
|
|
|
if (variant->sun_path[0])
|
|
remove("test");
|
|
}
|
|
|
|
TEST_F(unix_connect, test)
|
|
{
|
|
socklen_t addrlen;
|
|
struct sockaddr_un addr = {
|
|
.sun_family = self->family,
|
|
};
|
|
int err;
|
|
|
|
self->server = socket(self->family, variant->type, 0);
|
|
ASSERT_NE(-1, self->server);
|
|
|
|
addrlen = offsetof(struct sockaddr_un, sun_path) + variant->len;
|
|
memcpy(&addr.sun_path, variant->sun_path, variant->len);
|
|
|
|
err = bind(self->server, (struct sockaddr *)&addr, addrlen);
|
|
ASSERT_EQ(0, err);
|
|
|
|
if (variant->type == SOCK_STREAM) {
|
|
err = listen(self->server, 32);
|
|
ASSERT_EQ(0, err);
|
|
}
|
|
|
|
err = unshare(variant->flags);
|
|
ASSERT_EQ(0, err);
|
|
|
|
self->client = socket(self->family, variant->type, 0);
|
|
ASSERT_LT(0, self->client);
|
|
|
|
err = connect(self->client, (struct sockaddr *)&addr, addrlen);
|
|
ASSERT_EQ(variant->err, err == -1 ? errno : 0);
|
|
}
|
|
|
|
TEST_HARNESS_MAIN
|