From f0554c3b26cac12337570e5a4c212df8a59e3cef Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 25 Nov 2022 17:49:20 +0100 Subject: sys/linux: use common mount options in syz_mount_image Common options like ro/rw/sync/async can be used with any mount. Add them to the options used by syz_mount_image. --- sys/linux/filesystem.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/filesystem.txt b/sys/linux/filesystem.txt index d3ddd660f..d62c9c4bd 100644 --- a/sys/linux/filesystem.txt +++ b/sys/linux/filesystem.txt @@ -161,9 +161,9 @@ syz_mount_image$v7(fs ptr[in, string["v7"]], dir ptr[in, filename], flags flags[ syz_mount_image$tmpfs(fs ptr[in, string["tmpfs"]], dir ptr[in, filename], flags flags[mount_flags], opts ptr[in, fs_options[tmpfs_options]], chdir bool8, size len[img], img ptr[in, compressed_image]) fd_dir (timeout[SYZ_MOUNT_IMAGE_TIMEOUT], no_generate, no_minimize) type fs_options[ELEMS] { - elems array[fs_opt_elem[ELEMS]] - security array[fs_opt_elem[fs_options_security]] - null const[0, int8] + elems array[fs_opt_elem[ELEMS]] + common array[fs_opt_elem[fs_options_common]] + null const[0, int8] } [packed] type fs_opt_elem[ELEMS] { @@ -193,7 +193,9 @@ type fs_opt_cp_num[NAME] fs_opt[NAME, stringnoz[codepage_nums]] fs_opt_digits_suffix = '-', 'x', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'k', 'm', 'g', 't', 'p', 'e', '%' -fs_options_security [ +fs_options_common [ + flag stringnoz[fsconfig_flag_params] + # SELinux options: context fs_opt["context", stringnoz[selinux_user_context]] fscontext fs_opt["fscontext", stringnoz[selinux_user_context]] -- cgit mrf-deployment