From e9b3467100d75548220cc6e71e005a97732d66e7 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 10 Jan 2019 14:29:55 +0100 Subject: sys/linux: add trusty support Add support for trusty tipc devices and several trusty app ports. Update #933 --- executor/defs.h | 10 +++---- executor/syscalls.h | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 5 deletions(-) (limited to 'executor') diff --git a/executor/defs.h b/executor/defs.h index 19aa0a3c2..9fdee0f78 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -60,7 +60,7 @@ #if GOARCH_386 #define GOARCH "386" -#define SYZ_REVISION "fd6c8c0d5453152c503a72e196385a9ec6ac32b2" +#define SYZ_REVISION "2add9eb5de33dbfa073790d7af2cb5a543062225" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -70,7 +70,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "714db9567bad780c568ce486773f7508db10e38e" +#define SYZ_REVISION "85924b0693363419c2ea4f8588a815526691dd50" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -80,7 +80,7 @@ #if GOARCH_arm #define GOARCH "arm" -#define SYZ_REVISION "9a8f2f521bada026833882545a3c1dfde4f3ec87" +#define SYZ_REVISION "5fb6ba1fcab442e1305ff81004954b7ee140e165" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -90,7 +90,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "21250148b8a615197750c2b1e538f3fdb0fd380d" +#define SYZ_REVISION "7f0cf979fc6d1fc624ee0f2187d86f90279b0574" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 @@ -100,7 +100,7 @@ #if GOARCH_ppc64le #define GOARCH "ppc64le" -#define SYZ_REVISION "f1dfc77ec33b988ac23bfd1917705787a96b5348" +#define SYZ_REVISION "debbebfbc6525345884bd5c7595a0d8804bc46db" #define SYZ_EXECUTOR_USES_FORK_SERVER 1 #define SYZ_EXECUTOR_USES_SHMEM 1 #define SYZ_PAGE_SIZE 4096 diff --git a/executor/syscalls.h b/executor/syscalls.h index b14818af9..2ddedf252 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -2474,6 +2474,11 @@ const call_t syscalls[] = { {"ioctl$TIOCSSOFTCAR", 54}, {"ioctl$TIOCSTI", 54}, {"ioctl$TIOCSWINSZ", 54}, + {"ioctl$TIPC_IOC_CONNECT", 54}, + {"ioctl$TIPC_IOC_CONNECT_avb", 54}, + {"ioctl$TIPC_IOC_CONNECT_gatekeeper", 54}, + {"ioctl$TIPC_IOC_CONNECT_keymaster_secure", 54}, + {"ioctl$TIPC_IOC_CONNECT_km", 54}, {"ioctl$TUNATTACHFILTER", 54}, {"ioctl$TUNDETACHFILTER", 54}, {"ioctl$TUNGETFEATURES", 54}, @@ -2940,6 +2945,11 @@ const call_t syscalls[] = { {"openat$snapshot", 295}, {"openat$sr", 295}, {"openat$sw_sync", 295}, + {"openat$trusty", 295}, + {"openat$trusty_avb", 295}, + {"openat$trusty_gatekeeper", 295}, + {"openat$trusty_km", 295}, + {"openat$trusty_km_secure", 295}, {"openat$tun", 295}, {"openat$ubi_ctrl", 295}, {"openat$udambuf", 295}, @@ -3823,6 +3833,11 @@ const call_t syscalls[] = { {"write$selinux_validatetrans", 4}, {"write$smack_current", 4}, {"write$sndseq", 4}, + {"write$trusty", 4}, + {"write$trusty_avb", 4}, + {"write$trusty_gatekeeper", 4}, + {"write$trusty_km", 4}, + {"write$trusty_km_secure", 4}, {"write$tun", 4}, {"write$uinput_user_dev", 4}, {"write$vhci", 4}, @@ -4985,6 +5000,11 @@ const call_t syscalls[] = { {"ioctl$TIOCSSOFTCAR", 16}, {"ioctl$TIOCSTI", 16}, {"ioctl$TIOCSWINSZ", 16}, + {"ioctl$TIPC_IOC_CONNECT", 16}, + {"ioctl$TIPC_IOC_CONNECT_avb", 16}, + {"ioctl$TIPC_IOC_CONNECT_gatekeeper", 16}, + {"ioctl$TIPC_IOC_CONNECT_keymaster_secure", 16}, + {"ioctl$TIPC_IOC_CONNECT_km", 16}, {"ioctl$TUNATTACHFILTER", 16}, {"ioctl$TUNDETACHFILTER", 16}, {"ioctl$TUNGETFEATURES", 16}, @@ -5461,6 +5481,11 @@ const call_t syscalls[] = { {"openat$snapshot", 257}, {"openat$sr", 257}, {"openat$sw_sync", 257}, + {"openat$trusty", 257}, + {"openat$trusty_avb", 257}, + {"openat$trusty_gatekeeper", 257}, + {"openat$trusty_km", 257}, + {"openat$trusty_km_secure", 257}, {"openat$tun", 257}, {"openat$ubi_ctrl", 257}, {"openat$udambuf", 257}, @@ -6372,6 +6397,11 @@ const call_t syscalls[] = { {"write$selinux_validatetrans", 1}, {"write$smack_current", 1}, {"write$sndseq", 1}, + {"write$trusty", 1}, + {"write$trusty_avb", 1}, + {"write$trusty_gatekeeper", 1}, + {"write$trusty_km", 1}, + {"write$trusty_km_secure", 1}, {"write$tun", 1}, {"write$uinput_user_dev", 1}, {"write$vhci", 1}, @@ -7495,6 +7525,11 @@ const call_t syscalls[] = { {"ioctl$TIOCSSOFTCAR", 54}, {"ioctl$TIOCSTI", 54}, {"ioctl$TIOCSWINSZ", 54}, + {"ioctl$TIPC_IOC_CONNECT", 54}, + {"ioctl$TIPC_IOC_CONNECT_avb", 54}, + {"ioctl$TIPC_IOC_CONNECT_gatekeeper", 54}, + {"ioctl$TIPC_IOC_CONNECT_keymaster_secure", 54}, + {"ioctl$TIPC_IOC_CONNECT_km", 54}, {"ioctl$TUNATTACHFILTER", 54}, {"ioctl$TUNDETACHFILTER", 54}, {"ioctl$TUNGETFEATURES", 54}, @@ -7964,6 +7999,11 @@ const call_t syscalls[] = { {"openat$snapshot", 322}, {"openat$sr", 322}, {"openat$sw_sync", 322}, + {"openat$trusty", 322}, + {"openat$trusty_avb", 322}, + {"openat$trusty_gatekeeper", 322}, + {"openat$trusty_km", 322}, + {"openat$trusty_km_secure", 322}, {"openat$tun", 322}, {"openat$ubi_ctrl", 322}, {"openat$udambuf", 322}, @@ -8871,6 +8911,11 @@ const call_t syscalls[] = { {"write$selinux_validatetrans", 4}, {"write$smack_current", 4}, {"write$sndseq", 4}, + {"write$trusty", 4}, + {"write$trusty_avb", 4}, + {"write$trusty_gatekeeper", 4}, + {"write$trusty_km", 4}, + {"write$trusty_km_secure", 4}, {"write$tun", 4}, {"write$uinput_user_dev", 4}, {"write$vhci", 4}, @@ -9989,6 +10034,11 @@ const call_t syscalls[] = { {"ioctl$TIOCSSOFTCAR", 29}, {"ioctl$TIOCSTI", 29}, {"ioctl$TIOCSWINSZ", 29}, + {"ioctl$TIPC_IOC_CONNECT", 29}, + {"ioctl$TIPC_IOC_CONNECT_avb", 29}, + {"ioctl$TIPC_IOC_CONNECT_gatekeeper", 29}, + {"ioctl$TIPC_IOC_CONNECT_keymaster_secure", 29}, + {"ioctl$TIPC_IOC_CONNECT_km", 29}, {"ioctl$TUNATTACHFILTER", 29}, {"ioctl$TUNDETACHFILTER", 29}, {"ioctl$TUNGETFEATURES", 29}, @@ -10451,6 +10501,11 @@ const call_t syscalls[] = { {"openat$snapshot", 56}, {"openat$sr", 56}, {"openat$sw_sync", 56}, + {"openat$trusty", 56}, + {"openat$trusty_avb", 56}, + {"openat$trusty_gatekeeper", 56}, + {"openat$trusty_km", 56}, + {"openat$trusty_km_secure", 56}, {"openat$tun", 56}, {"openat$ubi_ctrl", 56}, {"openat$udambuf", 56}, @@ -11342,6 +11397,11 @@ const call_t syscalls[] = { {"write$selinux_validatetrans", 64}, {"write$smack_current", 64}, {"write$sndseq", 64}, + {"write$trusty", 64}, + {"write$trusty_avb", 64}, + {"write$trusty_gatekeeper", 64}, + {"write$trusty_km", 64}, + {"write$trusty_km_secure", 64}, {"write$tun", 64}, {"write$uinput_user_dev", 64}, {"write$vhci", 64}, @@ -12455,6 +12515,11 @@ const call_t syscalls[] = { {"ioctl$TIOCSPGRP", 54}, {"ioctl$TIOCSSOFTCAR", 54}, {"ioctl$TIOCSTI", 54}, + {"ioctl$TIPC_IOC_CONNECT", 54}, + {"ioctl$TIPC_IOC_CONNECT_avb", 54}, + {"ioctl$TIPC_IOC_CONNECT_gatekeeper", 54}, + {"ioctl$TIPC_IOC_CONNECT_keymaster_secure", 54}, + {"ioctl$TIPC_IOC_CONNECT_km", 54}, {"ioctl$TUNATTACHFILTER", 54}, {"ioctl$TUNDETACHFILTER", 54}, {"ioctl$TUNGETFEATURES", 54}, @@ -12820,6 +12885,11 @@ const call_t syscalls[] = { {"openat$snapshot", 286}, {"openat$sr", 286}, {"openat$sw_sync", 286}, + {"openat$trusty", 286}, + {"openat$trusty_avb", 286}, + {"openat$trusty_gatekeeper", 286}, + {"openat$trusty_km", 286}, + {"openat$trusty_km_secure", 286}, {"openat$tun", 286}, {"openat$ubi_ctrl", 286}, {"openat$udambuf", 286}, @@ -13700,6 +13770,11 @@ const call_t syscalls[] = { {"write$selinux_validatetrans", 4}, {"write$smack_current", 4}, {"write$sndseq", 4}, + {"write$trusty", 4}, + {"write$trusty_avb", 4}, + {"write$trusty_gatekeeper", 4}, + {"write$trusty_km", 4}, + {"write$trusty_km_secure", 4}, {"write$tun", 4}, {"write$uinput_user_dev", 4}, {"write$vhci", 4}, -- cgit mrf-deployment