Skip to content

Commit cc37478

Browse files
committed
selftests/landlock: Add cred_transfer test
Check that keyctl(KEYCTL_SESSION_TO_PARENT) preserves the parent's restrictions. Fixes: e119981 ("selftests/landlock: Add user space tests") Co-developed-by: Jann Horn <jannh@google.com> Signed-off-by: Jann Horn <jannh@google.com> Link: https://lore.kernel.org/r/20240724.Ood5aige9she@digikod.net Signed-off-by: Mickaël Salaün <mic@digikod.net>
1 parent 39705a6 commit cc37478

File tree

2 files changed

+75
-0
lines changed

2 files changed

+75
-0
lines changed

tools/testing/selftests/landlock/base_test.c

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#define _GNU_SOURCE
1010
#include <errno.h>
1111
#include <fcntl.h>
12+
#include <linux/keyctl.h>
1213
#include <linux/landlock.h>
1314
#include <string.h>
1415
#include <sys/prctl.h>
@@ -326,4 +327,77 @@ TEST(ruleset_fd_transfer)
326327
ASSERT_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
327328
}
328329

330+
TEST(cred_transfer)
331+
{
332+
struct landlock_ruleset_attr ruleset_attr = {
333+
.handled_access_fs = LANDLOCK_ACCESS_FS_READ_DIR,
334+
};
335+
int ruleset_fd, dir_fd;
336+
pid_t child;
337+
int status;
338+
339+
drop_caps(_metadata);
340+
341+
dir_fd = open("/", O_RDONLY | O_DIRECTORY | O_CLOEXEC);
342+
EXPECT_LE(0, dir_fd);
343+
EXPECT_EQ(0, close(dir_fd));
344+
345+
/* Denies opening directories. */
346+
ruleset_fd =
347+
landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr), 0);
348+
ASSERT_LE(0, ruleset_fd);
349+
EXPECT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0));
350+
ASSERT_EQ(0, landlock_restrict_self(ruleset_fd, 0));
351+
EXPECT_EQ(0, close(ruleset_fd));
352+
353+
/* Checks ruleset enforcement. */
354+
EXPECT_EQ(-1, open("/", O_RDONLY | O_DIRECTORY | O_CLOEXEC));
355+
EXPECT_EQ(EACCES, errno);
356+
357+
/* Needed for KEYCTL_SESSION_TO_PARENT permission checks */
358+
EXPECT_NE(-1, syscall(__NR_keyctl, KEYCTL_JOIN_SESSION_KEYRING, NULL, 0,
359+
0, 0))
360+
{
361+
TH_LOG("Failed to join session keyring: %s", strerror(errno));
362+
}
363+
364+
child = fork();
365+
ASSERT_LE(0, child);
366+
if (child == 0) {
367+
/* Checks ruleset enforcement. */
368+
EXPECT_EQ(-1, open("/", O_RDONLY | O_DIRECTORY | O_CLOEXEC));
369+
EXPECT_EQ(EACCES, errno);
370+
371+
/*
372+
* KEYCTL_SESSION_TO_PARENT is a no-op unless we have a
373+
* different session keyring in the child, so make that happen.
374+
*/
375+
EXPECT_NE(-1, syscall(__NR_keyctl, KEYCTL_JOIN_SESSION_KEYRING,
376+
NULL, 0, 0, 0));
377+
378+
/*
379+
* KEYCTL_SESSION_TO_PARENT installs credentials on the parent
380+
* that never go through the cred_prepare hook, this path uses
381+
* cred_transfer instead.
382+
*/
383+
EXPECT_EQ(0, syscall(__NR_keyctl, KEYCTL_SESSION_TO_PARENT, 0,
384+
0, 0, 0));
385+
386+
/* Re-checks ruleset enforcement. */
387+
EXPECT_EQ(-1, open("/", O_RDONLY | O_DIRECTORY | O_CLOEXEC));
388+
EXPECT_EQ(EACCES, errno);
389+
390+
_exit(_metadata->exit_code);
391+
return;
392+
}
393+
394+
EXPECT_EQ(child, waitpid(child, &status, 0));
395+
EXPECT_EQ(1, WIFEXITED(status));
396+
EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
397+
398+
/* Re-checks ruleset enforcement. */
399+
EXPECT_EQ(-1, open("/", O_RDONLY | O_DIRECTORY | O_CLOEXEC));
400+
EXPECT_EQ(EACCES, errno);
401+
}
402+
329403
TEST_HARNESS_MAIN

tools/testing/selftests/landlock/config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ CONFIG_CGROUPS=y
22
CONFIG_CGROUP_SCHED=y
33
CONFIG_INET=y
44
CONFIG_IPV6=y
5+
CONFIG_KEYS=y
56
CONFIG_NET=y
67
CONFIG_NET_NS=y
78
CONFIG_OVERLAY_FS=y

0 commit comments

Comments
 (0)