From deb0e69e1028ba3152631c3f1d2fac98c12e33a5 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 11 Jun 2018 10:02:51 +0200 Subject: executor: always use errors=continue when mounting ext2/3/4 For ext2/3/4 we have to have errors=continue because the image can contain errors=panic flag and can legally crash kernel. Fixes #599 --- sys/linux/filesystem.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'sys/linux/filesystem.txt') diff --git a/sys/linux/filesystem.txt b/sys/linux/filesystem.txt index bbd6a0769..c9460adf5 100644 --- a/sys/linux/filesystem.txt +++ b/sys/linux/filesystem.txt @@ -16,7 +16,7 @@ syz_mount_image$msdos(fs ptr[in, string["msdos"]], dir ptr[in, filename], size i syz_mount_image$bfs(fs ptr[in, string["bfs"]], dir ptr[in, filename], size intptr, nsegs len[segments], segments ptr[in, array[fs_image_segment]], flags flags[mount_flags], opts const[0]) -syz_mount_image$xfs(fs ptr[in, string["xfs"]], dir ptr[in, filename], size intptr, nsegs len[segments], segments ptr[in, array[fs_image_segment]], flags flags[mount_flags], opts ptr[in, xfs_full_options]) +syz_mount_image$xfs(fs ptr[in, string["xfs"]], dir ptr[in, filename], size intptr, nsegs len[segments], segments ptr[in, array[fs_image_segment]], flags flags[mount_flags], opts ptr[in, xfs_options]) syz_mount_image$minix(fs ptr[in, string["minix"]], dir ptr[in, filename], size intptr, nsegs len[segments], segments ptr[in, array[fs_image_segment]], flags flags[mount_flags], opts const[0]) @@ -113,13 +113,6 @@ vfat_options [ codepage fs_opt_cp_num["codepage"] ] [varlen] -xfs_full_options { -# We always set nouuid because xfs has a global table uuids and if two parallel -# executors mounts fs with the same uuid, second mount fails. - nouuid stringnoz["nouuid,"] - options fs_options[xfs_options] -} - xfs_options [ wsync stringnoz["wsync"] noalign stringnoz["noalign"] -- cgit mrf-deployment