selftests/ovl: test pseudo filesystem upper and lower with data-only layers
PATCH 1/1 selftests/ovl: test pseudo filesystem upper and lower with data-only layers
A pseudo filesystem lower layer is now refused along with data-only layers and a pseudo filesystem is refused as upper layer.
Split the lowerdir_sysfs test, so that sysfs as a regular lower layer is still expected to mount, but sysfs as a lower layer along with a data-only layer is expected to fail.
Add tests that sysfs as upperdir is refused via legacy mount options and via fsconfig by path and by file descriptor, and a tmpfs upperdir control test.
---
Christian,
This applies on top of your selftest patch [1] and adapts it to the expanded ban in "ovl: refuse pseudo filesystem layers in some setups".
On a kernel without the pseudo series, datadir_sysfs, lowerdir_sysfs_with_datadir and upperdir_sysfs fail as expected (sysfs upper falls back to a read-only mount) and the rest pass. I did not test it with the full series.
Thanks,
Amir.
[1] https://lore.kernel.org/linux-fsdevel/[email protected]/
.../filesystems/overlayfs/pseudo_datadir.c | 83 ++++++++++++++++++- 1 file changed, 80 insertions(+), 3 deletions(-)
tools/testing/selftests/filesystems/overlayfs/pseudo_datadir.c +80 -3
@@ -22,6 +22,7 @@ static int setup_tmp(void)if (sys_mount ("tmpfs" ,"/tmp" ,"tmpfs" ,0 ,NULL ))return -errno;if (mkdir ("/tmp/lower" ,0755 ) ||mkdir ("/tmp/data" ,0755 ) || +mkdir ("/tmp/upper" ,0755 ) ||mkdir ("/tmp/work" ,0755 ) ||mkdir ("/tmp/merged" ,0755 ))return -errno;return 0 ;
@@ -60,6 +61,54 @@ static int set_layer(int fd_context, const char *key, const char *path,return ret; } +/* Mount an overlayfs with the legacy "upperdir=" and "workdir=" options. */ +static int mount_upperdir (const char *upper,const char *work) +{ +char opts[256 ]; + +snprintf (opts,sizeof (opts),"lowerdir=/tmp/lower,upperdir=%s,workdir=%s" , + upper, work); +if (sys_mount ("overlay" ,"/tmp/merged" ,"overlay" ,0 , opts)) +return -errno; +if (umount2 ("/tmp/merged" ,0 )) +return -errno; +return 0 ; +} + +/* Create an overlayfs with "upperdir" and "workdir" through fsconfig. */ +static int fsmount_upper (const char *upper,const char *work,bool by_fd) +{ +int fd_context, fd_mnt, ret; + + fd_context =sys_fsopen ("overlay" ,FSOPEN_CLOEXEC ); +if (fd_context <0 ) +return -errno; + + ret =set_layer (fd_context,"lowerdir+" ,"/tmp/lower" , by_fd); +if (ret) + goto out; + ret =set_layer (fd_context,"upperdir" , upper, by_fd); +if (ret) + goto out; + ret =set_layer (fd_context,"workdir" , work, by_fd); +if (ret) + goto out; + +if (sys_fsconfig (fd_context,FSCONFIG_CMD_CREATE ,NULL ,NULL ,0 )) { + ret = -errno; + goto out; + } + + fd_mnt =sys_fsmount (fd_context,FSMOUNT_CLOEXEC ,0 ); +if (fd_mnt <0 ) + ret = -errno; +else +close (fd_mnt); +out: +close (fd_context); +return ret; +} +/* Create an overlayfs with "lowerdir+" and "datadir+" through fsconfig. */ static int fsmount_layers (const char *lower,const char *data,bool by_fd) {
@@ -123,9 +172,37 @@ TEST(lowerdir_sysfs)ASSERT_EQ (setup_tmp (),0 );EXPECT_EQ (mount_lowerdir ("/sys/kernel:/tmp/lower" ),0 ); -EXPECT_EQ (mount_lowerdir ("/sys/kernel::/tmp/data" ),0 ); -EXPECT_EQ (fsmount_layers ("/sys/kernel" ,"/tmp/data" , false),0 ); -EXPECT_EQ (fsmount_layers ("/sys/kernel" ,"/tmp/data" , true),0 ); +} + +TEST (lowerdir_sysfs_with_datadir) +{ +ASSERT_EQ (setup_tmp (),0 ); + +EXPECT_EQ (mount_lowerdir ("/sys/kernel::/tmp/data" ), -EINVAL ); +EXPECT_EQ (fsmount_layers ("/sys/kernel" ,"/tmp/data" , false), -EINVAL ); +EXPECT_EQ (fsmount_layers ("/sys/kernel" ,"/tmp/data" , true), -EINVAL ); +} + +/* +* Without the check, sysfs as upperdir falls back to a read-only mount +* because the work dir cannot be created. +*/ +TEST (upperdir_sysfs) +{ +ASSERT_EQ (setup_tmp (),0 ); + +EXPECT_EQ (mount_upperdir ("/sys/block" ,"/sys/bus" ), -EINVAL ); +EXPECT_EQ (fsmount_upper ("/sys/block" ,"/sys/bus" , false), -EINVAL ); +EXPECT_EQ (fsmount_upper ("/sys/block" ,"/sys/bus" , true), -EINVAL ); +} + +TEST (upperdir_tmpfs) +{ +ASSERT_EQ (setup_tmp (),0 ); + +EXPECT_EQ (mount_upperdir ("/tmp/upper" ,"/tmp/work" ),0 ); +EXPECT_EQ (fsmount_upper ("/tmp/upper" ,"/tmp/work" , false),0 ); +EXPECT_EQ (fsmount_upper ("/tmp/upper" ,"/tmp/work" , true),0 ); }TEST_HARNESS_MAIN
Signature · 1 line
2.56.1