| Message ID | 20240405214040.101396-8-gnoack@google.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Landlock: IOCTL support | expand |
On Fri, Apr 05, 2024 at 09:40:35PM +0000, Günther Noack wrote: Please add a small patch description. You can list the name of the test. > Suggested-by: Mickaël Salaün <mic@digikod.net> > Signed-off-by: Günther Noack <gnoack@google.com> > --- > tools/testing/selftests/landlock/fs_test.c | 51 ++++++++++++++++++++++ > 1 file changed, 51 insertions(+) > > diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c > index 215f0e8bcd69..10b29a288e9c 100644 > --- a/tools/testing/selftests/landlock/fs_test.c > +++ b/tools/testing/selftests/landlock/fs_test.c > @@ -20,8 +20,10 @@ > #include <sys/mount.h> > #include <sys/prctl.h> > #include <sys/sendfile.h> > +#include <sys/socket.h> > #include <sys/stat.h> > #include <sys/sysmacros.h> > +#include <sys/un.h> > #include <sys/vfs.h> > #include <unistd.h> > > @@ -3978,6 +3980,55 @@ TEST_F_FORK(layout1, named_pipe_ioctl) > ASSERT_EQ(child_pid, waitpid(child_pid, NULL, 0)); > } > > +/* For named UNIX domain sockets, no IOCTL restrictions apply. */ > +TEST_F_FORK(layout1, named_unix_domain_socket_ioctl) > +{ > + const char *const path = file1_s1d1; > + int srv_fd, cli_fd, ruleset_fd; > + socklen_t size; > + struct sockaddr_un srv_un, cli_un; > + const struct landlock_ruleset_attr attr = { > + .handled_access_fs = LANDLOCK_ACCESS_FS_IOCTL_DEV, > + }; > + > + /* Sets up a server */ > + srv_un.sun_family = AF_UNIX; > + strncpy(srv_un.sun_path, path, sizeof(srv_un.sun_path)); > + > + ASSERT_EQ(0, unlink(path)); > + ASSERT_LE(0, (srv_fd = socket(AF_UNIX, SOCK_STREAM, 0))); I'd prefer not to have this kind of assignment and check at the same time. > + > + size = offsetof(struct sockaddr_un, sun_path) + strlen(srv_un.sun_path); > + ASSERT_EQ(0, bind(srv_fd, (struct sockaddr *)&srv_un, size)); > + ASSERT_EQ(0, listen(srv_fd, 10 /* qlen */)); > + > + /* Enables Landlock. */ > + ruleset_fd = landlock_create_ruleset(&attr, sizeof(attr), 0); > + ASSERT_LE(0, ruleset_fd); > + enforce_ruleset(_metadata, ruleset_fd); > + ASSERT_EQ(0, close(ruleset_fd)); > + > + /* Sets up a client connection to it */ > + cli_un.sun_family = AF_UNIX; > + > + ASSERT_LE(0, (cli_fd = socket(AF_UNIX, SOCK_STREAM, 0))); Same here. > + > + size = offsetof(struct sockaddr_un, sun_path) + strlen(cli_un.sun_path); > + ASSERT_EQ(0, bind(cli_fd, (struct sockaddr *)&cli_un, size)); > + > + bzero(&cli_un, sizeof(cli_un)); > + cli_un.sun_family = AF_UNIX; > + strncpy(cli_un.sun_path, path, sizeof(cli_un.sun_path)); > + size = offsetof(struct sockaddr_un, sun_path) + strlen(cli_un.sun_path); > + > + ASSERT_EQ(0, connect(cli_fd, (struct sockaddr *)&cli_un, size)); > + > + /* FIONREAD and other IOCTLs should not be forbidden. */ > + EXPECT_EQ(0, test_fionread_ioctl(cli_fd)); > + > + ASSERT_EQ(0, close(cli_fd)); > +} > + > /* clang-format off */ > FIXTURE(ioctl) {}; > > -- > 2.44.0.478.gd926399ef9-goog > >
On Fri, Apr 12, 2024 at 05:17:54PM +0200, Mickaël Salaün wrote: > On Fri, Apr 05, 2024 at 09:40:35PM +0000, Günther Noack wrote: > > Please add a small patch description. You can list the name of the > test. Done - I explained what the test checks for (that the access right should have no effect on named UNIX domain sockets). > > diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c > > index 215f0e8bcd69..10b29a288e9c 100644 > > --- a/tools/testing/selftests/landlock/fs_test.c > > +++ b/tools/testing/selftests/landlock/fs_test.c > > + ASSERT_LE(0, (srv_fd = socket(AF_UNIX, SOCK_STREAM, 0))); > > I'd prefer not to have this kind of assignment and check at the same > time. Done. > > + ASSERT_LE(0, (cli_fd = socket(AF_UNIX, SOCK_STREAM, 0))); > > Same here. Done. —Günther
diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c index 215f0e8bcd69..10b29a288e9c 100644 --- a/tools/testing/selftests/landlock/fs_test.c +++ b/tools/testing/selftests/landlock/fs_test.c @@ -20,8 +20,10 @@ #include <sys/mount.h> #include <sys/prctl.h> #include <sys/sendfile.h> +#include <sys/socket.h> #include <sys/stat.h> #include <sys/sysmacros.h> +#include <sys/un.h> #include <sys/vfs.h> #include <unistd.h> @@ -3978,6 +3980,55 @@ TEST_F_FORK(layout1, named_pipe_ioctl) ASSERT_EQ(child_pid, waitpid(child_pid, NULL, 0)); } +/* For named UNIX domain sockets, no IOCTL restrictions apply. */ +TEST_F_FORK(layout1, named_unix_domain_socket_ioctl) +{ + const char *const path = file1_s1d1; + int srv_fd, cli_fd, ruleset_fd; + socklen_t size; + struct sockaddr_un srv_un, cli_un; + const struct landlock_ruleset_attr attr = { + .handled_access_fs = LANDLOCK_ACCESS_FS_IOCTL_DEV, + }; + + /* Sets up a server */ + srv_un.sun_family = AF_UNIX; + strncpy(srv_un.sun_path, path, sizeof(srv_un.sun_path)); + + ASSERT_EQ(0, unlink(path)); + ASSERT_LE(0, (srv_fd = socket(AF_UNIX, SOCK_STREAM, 0))); + + size = offsetof(struct sockaddr_un, sun_path) + strlen(srv_un.sun_path); + ASSERT_EQ(0, bind(srv_fd, (struct sockaddr *)&srv_un, size)); + ASSERT_EQ(0, listen(srv_fd, 10 /* qlen */)); + + /* Enables Landlock. */ + ruleset_fd = landlock_create_ruleset(&attr, sizeof(attr), 0); + ASSERT_LE(0, ruleset_fd); + enforce_ruleset(_metadata, ruleset_fd); + ASSERT_EQ(0, close(ruleset_fd)); + + /* Sets up a client connection to it */ + cli_un.sun_family = AF_UNIX; + + ASSERT_LE(0, (cli_fd = socket(AF_UNIX, SOCK_STREAM, 0))); + + size = offsetof(struct sockaddr_un, sun_path) + strlen(cli_un.sun_path); + ASSERT_EQ(0, bind(cli_fd, (struct sockaddr *)&cli_un, size)); + + bzero(&cli_un, sizeof(cli_un)); + cli_un.sun_family = AF_UNIX; + strncpy(cli_un.sun_path, path, sizeof(cli_un.sun_path)); + size = offsetof(struct sockaddr_un, sun_path) + strlen(cli_un.sun_path); + + ASSERT_EQ(0, connect(cli_fd, (struct sockaddr *)&cli_un, size)); + + /* FIONREAD and other IOCTLs should not be forbidden. */ + EXPECT_EQ(0, test_fionread_ioctl(cli_fd)); + + ASSERT_EQ(0, close(cli_fd)); +} + /* clang-format off */ FIXTURE(ioctl) {};
Suggested-by: Mickaël Salaün <mic@digikod.net> Signed-off-by: Günther Noack <gnoack@google.com> --- tools/testing/selftests/landlock/fs_test.c | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+)