From 676bd07e7e80f8a270af7f0276443c68f4a99e25 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 2 Apr 2018 20:10:48 +0200 Subject: sys/linux: test various binfmt's in execve --- pkg/csource/linux_common.go | 13 +++++++++++++ pkg/kernel/generated.go | 1 + 2 files changed, 14 insertions(+) (limited to 'pkg') diff --git a/pkg/csource/linux_common.go b/pkg/csource/linux_common.go index 78d9106de..4e7b0fef4 100644 --- a/pkg/csource/linux_common.go +++ b/pkg/csource/linux_common.go @@ -2142,6 +2142,16 @@ static void setup_cgroups() debug("chmod(/syzcgroup/net) failed: %d\n", errno); } } + +static void setup_binfmt_misc() +{ + if (!write_file("/proc/sys/fs/binfmt_misc/register", ":syz0:M:0:syz0::./file0:")) { + debug("write(/proc/sys/fs/binfmt_misc/register, syz0) failed: %d\n", errno); + } + if (!write_file("/proc/sys/fs/binfmt_misc/register", ":syz1:M:1:yz1::./file0:POC")) { + debug("write(/proc/sys/fs/binfmt_misc/register, syz1) failed: %d\n", errno); + } +} #endif #if defined(SYZ_EXECUTOR) || defined(SYZ_SANDBOX_NONE) || defined(SYZ_SANDBOX_SETUID) || defined(SYZ_SANDBOX_NAMESPACE) @@ -2206,6 +2216,7 @@ static int do_sandbox_none(void) #if defined(SYZ_EXECUTOR) || defined(SYZ_ENABLE_CGROUPS) setup_cgroups(); + setup_binfmt_misc(); #endif sandbox_common(); if (unshare(CLONE_NEWNET)) { @@ -2234,6 +2245,7 @@ static int do_sandbox_setuid(void) #if defined(SYZ_EXECUTOR) || defined(SYZ_ENABLE_CGROUPS) setup_cgroups(); + setup_binfmt_misc(); #endif sandbox_common(); if (unshare(CLONE_NEWNET)) @@ -2367,6 +2379,7 @@ static int do_sandbox_namespace(void) #if defined(SYZ_EXECUTOR) || defined(SYZ_ENABLE_CGROUPS) setup_cgroups(); + setup_binfmt_misc(); #endif real_uid = getuid(); real_gid = getgid(); diff --git a/pkg/kernel/generated.go b/pkg/kernel/generated.go index bd76519b9..5ea9a4d9b 100644 --- a/pkg/kernel/generated.go +++ b/pkg/kernel/generated.go @@ -37,6 +37,7 @@ sudo sed -i "/^root/ { s/:x:/::/ }" disk.mnt/etc/passwd echo "T0:23:respawn:/sbin/getty -L ttyS0 115200 vt100" | sudo tee -a disk.mnt/etc/inittab echo -en "auto lo\niface lo inet loopback\nauto eth0\niface eth0 inet dhcp\n" | sudo tee disk.mnt/etc/network/interfaces echo "debugfs /sys/kernel/debug debugfs defaults 0 0" | sudo tee -a disk.mnt/etc/fstab +echo 'binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc defaults 0 0' | sudo tee -a disk.mnt/etc/fstab for i in {0..31}; do echo "KERNEL==\"binder$i\", NAME=\"binder$i\", MODE=\"0666\"" | \ tee -a disk.mnt/etc/udev/50-binder.rules -- cgit mrf-deployment