Skip to content

Commit 96f0943

Browse files
committed
selftests/ovl: add first selftest for "override_creds"
Add a simple test to verify that the new "override_creds" option works. Link: https://lore.kernel.org/r/20250219-work-overlayfs-v3-2-46af55e4ceda@kernel.org Reviewed-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 539a087 commit 96f0943

1 file changed

Lines changed: 101 additions & 0 deletions

File tree

tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <unistd.h>
1212

1313
#include "../../kselftest_harness.h"
14+
#include "../../pidfd/pidfd.h"
1415
#include "log.h"
1516
#include "wrappers.h"
1617

@@ -214,4 +215,104 @@ TEST_F(set_layers_via_fds, set_500_layers_via_fds)
214215
ASSERT_EQ(close(fd_overlay), 0);
215216
}
216217

218+
TEST_F(set_layers_via_fds, set_override_creds)
219+
{
220+
int fd_context, fd_tmpfs, fd_overlay;
221+
int layer_fds[] = { [0 ... 3] = -EBADF };
222+
pid_t pid;
223+
int pidfd;
224+
225+
ASSERT_EQ(unshare(CLONE_NEWNS), 0);
226+
ASSERT_EQ(sys_mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL), 0);
227+
228+
fd_context = sys_fsopen("tmpfs", 0);
229+
ASSERT_GE(fd_context, 0);
230+
231+
ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);
232+
fd_tmpfs = sys_fsmount(fd_context, 0, 0);
233+
ASSERT_GE(fd_tmpfs, 0);
234+
ASSERT_EQ(close(fd_context), 0);
235+
236+
ASSERT_EQ(mkdirat(fd_tmpfs, "w", 0755), 0);
237+
ASSERT_EQ(mkdirat(fd_tmpfs, "u", 0755), 0);
238+
ASSERT_EQ(mkdirat(fd_tmpfs, "l1", 0755), 0);
239+
ASSERT_EQ(mkdirat(fd_tmpfs, "l2", 0755), 0);
240+
241+
layer_fds[0] = openat(fd_tmpfs, "w", O_DIRECTORY);
242+
ASSERT_GE(layer_fds[0], 0);
243+
244+
layer_fds[1] = openat(fd_tmpfs, "u", O_DIRECTORY);
245+
ASSERT_GE(layer_fds[1], 0);
246+
247+
layer_fds[2] = openat(fd_tmpfs, "l1", O_DIRECTORY);
248+
ASSERT_GE(layer_fds[2], 0);
249+
250+
layer_fds[3] = openat(fd_tmpfs, "l2", O_DIRECTORY);
251+
ASSERT_GE(layer_fds[3], 0);
252+
253+
ASSERT_EQ(sys_move_mount(fd_tmpfs, "", -EBADF, "/tmp", MOVE_MOUNT_F_EMPTY_PATH), 0);
254+
ASSERT_EQ(close(fd_tmpfs), 0);
255+
256+
fd_context = sys_fsopen("overlay", 0);
257+
ASSERT_GE(fd_context, 0);
258+
259+
ASSERT_NE(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir", NULL, layer_fds[2]), 0);
260+
261+
ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "workdir", NULL, layer_fds[0]), 0);
262+
ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "upperdir", NULL, layer_fds[1]), 0);
263+
ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[2]), 0);
264+
ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_FD, "lowerdir+", NULL, layer_fds[3]), 0);
265+
266+
ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_SET_STRING, "metacopy", "on", 0), 0);
267+
268+
pid = create_child(&pidfd, 0);
269+
EXPECT_GE(pid, 0);
270+
if (pid == 0) {
271+
if (sys_fsconfig(fd_context, FSCONFIG_SET_FLAG, "override_creds", NULL, 0)) {
272+
TH_LOG("sys_fsconfig should have succeeded");
273+
_exit(EXIT_FAILURE);
274+
}
275+
276+
_exit(EXIT_SUCCESS);
277+
}
278+
EXPECT_EQ(sys_waitid(P_PID, pid, NULL, WEXITED), 0);
279+
EXPECT_EQ(close(pidfd), 0);
280+
281+
pid = create_child(&pidfd, 0);
282+
EXPECT_GE(pid, 0);
283+
if (pid == 0) {
284+
if (sys_fsconfig(fd_context, FSCONFIG_SET_FLAG, "nooverride_creds", NULL, 0)) {
285+
TH_LOG("sys_fsconfig should have succeeded");
286+
_exit(EXIT_FAILURE);
287+
}
288+
289+
_exit(EXIT_SUCCESS);
290+
}
291+
EXPECT_EQ(sys_waitid(P_PID, pid, NULL, WEXITED), 0);
292+
EXPECT_EQ(close(pidfd), 0);
293+
294+
pid = create_child(&pidfd, 0);
295+
EXPECT_GE(pid, 0);
296+
if (pid == 0) {
297+
if (sys_fsconfig(fd_context, FSCONFIG_SET_FLAG, "override_creds", NULL, 0)) {
298+
TH_LOG("sys_fsconfig should have succeeded");
299+
_exit(EXIT_FAILURE);
300+
}
301+
302+
_exit(EXIT_SUCCESS);
303+
}
304+
EXPECT_EQ(sys_waitid(P_PID, pid, NULL, WEXITED), 0);
305+
EXPECT_EQ(close(pidfd), 0);
306+
307+
ASSERT_EQ(sys_fsconfig(fd_context, FSCONFIG_CMD_CREATE, NULL, NULL, 0), 0);
308+
309+
fd_overlay = sys_fsmount(fd_context, 0, 0);
310+
ASSERT_GE(fd_overlay, 0);
311+
312+
ASSERT_EQ(sys_move_mount(fd_overlay, "", -EBADF, "/set_layers_via_fds", MOVE_MOUNT_F_EMPTY_PATH), 0);
313+
314+
ASSERT_EQ(close(fd_context), 0);
315+
ASSERT_EQ(close(fd_overlay), 0);
316+
}
317+
217318
TEST_HARNESS_MAIN

0 commit comments

Comments
 (0)