From d646e21ff436cd2a40b23314436cd53f21ae9500 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 5 Jan 2020 12:44:49 +0100 Subject: prog: fix tests for string enforcement String value enforcement broke a number of tests where we use different values. Be more string as to what string values we use in tests. Required to add tmpfs descriptions to test syz_mount_image. Also special-casing AF_ALG algorithms as these are auto-generated. --- executor/defs.h | 14 +++++++------- executor/syscalls.h | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'executor') diff --git a/executor/defs.h b/executor/defs.h index e35a7aa0c..2b0b3d36f 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -70,7 +70,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "60284a1bda57bff40fe94277703623fa36bfcb96" +#define SYZ_REVISION "f41eafe08a2188491ae4ed315891cf8f179cdbb4" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -80,7 +80,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "3928f3959b7eaecdfa50b4a34b793bf3c8de6f3d" +#define SYZ_REVISION "4cd710fff6b0cd1d43fb3c93a4c0cff0ee17b7b6" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -90,7 +90,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "2930661805b8f6d08c643d7c929dafdb987efafb" +#define SYZ_REVISION "96aa2599facc18798afdb3ec3caa527502ee6de3" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -100,7 +100,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "bf6cfb68500b96326253f466030e12dba9ef40f2" +#define SYZ_REVISION "4d59f634a2d510b75fbe395c846175bf6375ebf8" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -110,7 +110,7 @@ #if GOARCH_mips64le #define GOARCH "mips64le" -#define SYZ_REVISION "5eab096e0942b59d4c4bf18af56e62a60f55b17d" +#define SYZ_REVISION "d1c79ef71ace73e98944bc41987f764bcbccdf0c" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -120,7 +120,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "1a229cfc979e27fa91bce266f093b9a5cc38c7bb" +#define SYZ_REVISION "2dc3cf9f494e0bc2d11e10146476d89933a812ff" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -185,7 +185,7 @@ #if GOARCH_64 #define GOARCH "64" -#define SYZ_REVISION "108f16d364fe32a8c41e4592f79eab831b5935a0" +#define SYZ_REVISION "69825d8961f9b9d716935a1e9585b512ce8ef9b7" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 diff --git a/executor/syscalls.h b/executor/syscalls.h index 1d23d2717..bdcf39785 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -4906,6 +4906,7 @@ const call_t syscalls[] = { {"syz_mount_image$ntfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$ocfs2", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$reiserfs", 0, (syscall_t)syz_mount_image}, + {"syz_mount_image$tmpfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$vfat", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$xfs", 0, (syscall_t)syz_mount_image}, {"syz_open_dev$I2C", 0, (syscall_t)syz_open_dev}, @@ -8080,6 +8081,7 @@ const call_t syscalls[] = { {"syz_mount_image$ntfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$ocfs2", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$reiserfs", 0, (syscall_t)syz_mount_image}, + {"syz_mount_image$tmpfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$vfat", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$xfs", 0, (syscall_t)syz_mount_image}, {"syz_open_dev$I2C", 0, (syscall_t)syz_open_dev}, @@ -11209,6 +11211,7 @@ const call_t syscalls[] = { {"syz_mount_image$ntfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$ocfs2", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$reiserfs", 0, (syscall_t)syz_mount_image}, + {"syz_mount_image$tmpfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$vfat", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$xfs", 0, (syscall_t)syz_mount_image}, {"syz_open_dev$I2C", 0, (syscall_t)syz_open_dev}, @@ -14309,6 +14312,7 @@ const call_t syscalls[] = { {"syz_mount_image$ntfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$ocfs2", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$reiserfs", 0, (syscall_t)syz_mount_image}, + {"syz_mount_image$tmpfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$vfat", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$xfs", 0, (syscall_t)syz_mount_image}, {"syz_open_dev$I2C", 0, (syscall_t)syz_open_dev}, @@ -17325,6 +17329,7 @@ const call_t syscalls[] = { {"syz_mount_image$ntfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$ocfs2", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$reiserfs", 0, (syscall_t)syz_mount_image}, + {"syz_mount_image$tmpfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$vfat", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$xfs", 0, (syscall_t)syz_mount_image}, {"syz_open_dev$I2C", 0, (syscall_t)syz_open_dev}, @@ -20447,6 +20452,7 @@ const call_t syscalls[] = { {"syz_mount_image$ntfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$ocfs2", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$reiserfs", 0, (syscall_t)syz_mount_image}, + {"syz_mount_image$tmpfs", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$vfat", 0, (syscall_t)syz_mount_image}, {"syz_mount_image$xfs", 0, (syscall_t)syz_mount_image}, {"syz_open_dev$I2C", 0, (syscall_t)syz_open_dev}, -- cgit mrf-deployment