From 84da034b1ed1d69311d84e7a10f426cfb3aade7b Mon Sep 17 00:00:00 2001
From: Andrey Konovalov <andreyknvl@google.com>
Date: Thu, 2 Apr 2020 17:03:12 +0200
Subject: sys/linux: run usb runtests with namespace/setuid sandbox

---
 sys/linux/test/vusb         | 2 --
 sys/linux/test/vusb_ath9k   | 2 +-
 sys/linux/test/vusb_cdc_ecm | 2 +-
 sys/linux/test/vusb_cdc_ncm | 2 +-
 sys/linux/test/vusb_hid     | 2 +-
 sys/linux/test/vusb_printer | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sys/linux/test/vusb b/sys/linux/test/vusb
index 78be090d5..9e47b44aa 100644
--- a/sys/linux/test/vusb
+++ b/sys/linux/test/vusb
@@ -1,3 +1 @@
-# requires: -sandbox=setuid -sandbox=namespace
-
 syz_usb_connect(0x0, 0x24, &(0x7f0000000000)={{0x12, 0x1, 0x0, 0x97, 0xff, 0x82, 0x8, 0x2058, 0x1005, 0xc19b, 0x0, 0x0, 0x0, 0x1, [{{0x9, 0x2, 0x12, 0x1, 0x0, 0x0, 0x0, 0x0, [{{0x9, 0x4, 0x8f, 0x0, 0x0, 0xbf, 0x57, 0x5a, 0x0, [], []}}]}}]}}, 0x0)
diff --git a/sys/linux/test/vusb_ath9k b/sys/linux/test/vusb_ath9k
index a2fe89f4c..bd095a9cb 100644
--- a/sys/linux/test/vusb_ath9k
+++ b/sys/linux/test/vusb_ath9k
@@ -1,4 +1,4 @@
-# requires: -sandbox=setuid -sandbox=namespace -repeat
+# requires: -repeat
 
 r0 = syz_usb_connect_ath9k(0x3, 0x5a, &(0x7f0000000080)={{0x12, 0x1, 0x200, 0xff, 0xff, 0xff, 0x40, 0xcf3, 0x9271, 0x108, 0x1, 0x2, 0x3, 0x1, [{{0x9, 0x2, 0x48, 0x1, 0x1, 0x0, 0x80, 0xfa, {{0x9, 0x4, 0x0, 0x0, 0x6, 0xff, 0x0, 0x0, 0x0, "", {{0x9, 0x5, 0x1, 0x2, 0x200, 0x0, 0x0, 0x0, ""}, {0x9, 0x5, 0x82, 0x2, 0x200, 0x0, 0x0, 0x0, ""}, {0x9, 0x5, 0x83, 0x3, 0x40, 0x1, 0x0, 0x0, ""}, {0x9, 0x5, 0x4, 0x3, 0x40, 0x1, 0x0, 0x0, ""}, {0x9, 0x5, 0x5, 0x2, 0x200, 0x0, 0x0, 0x0, ""}, {0x9, 0x5, 0x6, 0x2, 0x200, 0x0, 0x0, 0x0, ""}}}}}}]}}, 0x0)
 syz_usb_ep_write$ath9k_ep2(r0, 0x2, 0x10, &(0x7f0000000000)=@ready={0x0, 0x0, 0x8, 'BBBB', {0x1, 0x0, 0x0, 0x0, 0x0}})
diff --git a/sys/linux/test/vusb_cdc_ecm b/sys/linux/test/vusb_cdc_ecm
index a17ce3dd5..848158cc4 100644
--- a/sys/linux/test/vusb_cdc_ecm
+++ b/sys/linux/test/vusb_cdc_ecm
@@ -1,4 +1,4 @@
-# requires: -sandbox=setuid -sandbox=namespace -repeat
+# requires: -repeat
 
 r0 = syz_usb_connect$cdc_ecm(0x0, 0x4d, &(0x7f0000000000)={{0x12, 0x1, 0x0, 0x2, 0x0, 0x0, 0x40, 0x525, 0xa4a1, 0x40, 0x0, 0x0, 0xffffffffffff8001, 0x1, [{{0x9, 0x2, 0x3b, 0x1, 0x1, 0x0, 0x0, 0x0, [{{0x9, 0x4, 0x0, 0x0, 0x12, 0x2, 0x6, 0x0, 0x0, {{0x5, 0x24, 0x6, 0x0, 0x0, ""}, {0x5, 0x24, 0x0, 0x0}, {0xd, 0x24, 0xf, 0x1, 0x0, 0x0, 0x0, 0x0}, []}, {[], {{0x9, 0x5, 0x82, 0x2, 0x200, 0x0, 0x0, 0x0, ""}}, {{0x9, 0x5, 0x3, 0x2, 0x200, 0x0, 0x0, 0x0, ""}}}}}]}}]}}, &(0x7f0000001400)={0x0, 0x0, 0x0, 0x0, 0x0, []})
 syz_usb_control_io$cdc_ecm(r0, 0x0, 0x0)
diff --git a/sys/linux/test/vusb_cdc_ncm b/sys/linux/test/vusb_cdc_ncm
index 889ba5e38..f360a6dd3 100644
--- a/sys/linux/test/vusb_cdc_ncm
+++ b/sys/linux/test/vusb_cdc_ncm
@@ -1,4 +1,4 @@
-# requires: -sandbox=setuid -sandbox=namespace -repeat
+# requires: -repeat
 
 r0 = syz_usb_connect$cdc_ncm(0x0, 0x6e, &(0x7f0000000480)={{0x12, 0x1, 0x0, 0x2, 0x0, 0x0, 0x40, 0x525, 0xa4a1, 0x40, 0x1, 0x2, 0x3, 0x1, [{{0x9, 0x2, 0x5c, 0x2, 0x1, 0x0, 0x0, 0x0, {{0x9, 0x4, 0x0, 0x0, 0x1, 0x2, 0xd, 0x0, 0x0, {{0x5, 0x24, 0x6, 0x0, 0x1, ""}, {0x5, 0x24, 0x0, 0x0}, {0xd, 0x24, 0xf, 0x1, 0x0, 0x0, 0x0, 0x0}, {0x6, 0x24, 0x1a, 0x0, 0x0}, []}, {{0x9, 0x5, 0x81, 0x3, 0x200, 0x0, 0x0, 0x0, ""}}}, {0x9, 0x4, 0x1, 0x0, 0x0, 0x2, 0xd, 0x0, 0x0, "", ""}, {0x9, 0x4, 0x1, 0x1, 0x2, 0x2, 0xd, 0x0, 0x0, "", {{{0x9, 0x5, 0x82, 0x2, 0x200, 0x0, 0x0, 0x0, ""}}, {{0x9, 0x5, 0x3, 0x2, 0x200, 0x0, 0x0, 0x0, ""}}}}}}}]}}, 0x0)
 syz_usb_control_io$cdc_ncm(r0, 0x0, 0x0)
diff --git a/sys/linux/test/vusb_hid b/sys/linux/test/vusb_hid
index 289bf0528..de77a8dc2 100644
--- a/sys/linux/test/vusb_hid
+++ b/sys/linux/test/vusb_hid
@@ -1,4 +1,4 @@
-# requires: -sandbox=setuid -sandbox=namespace -repeat
+# requires: -repeat
 
 r0 = syz_usb_connect$hid(0x0, 0x36, &(0x7f0000000040)=ANY=[@ANYBLOB="12010000000018105e04da07000000000001090224000100000000090400000903000000092100000001222200090581030800000000"], 0x0)
 syz_usb_control_io$hid(r0, 0x0, 0x0)
diff --git a/sys/linux/test/vusb_printer b/sys/linux/test/vusb_printer
index 342a43405..59a9048f7 100644
--- a/sys/linux/test/vusb_printer
+++ b/sys/linux/test/vusb_printer
@@ -1,4 +1,4 @@
-# requires: -sandbox=setuid -sandbox=namespace -repeat
+# requires: -repeat
 
 r0 = syz_usb_connect$printer(0x0, 0x36, &(0x7f0000000000)={{0x12, 0x1, 0x0, 0x0, 0x0, 0x0, 0x20, 0x3f0, 0x6c17, 0x40, 0x0, 0x0, 0x0, 0x1, [{{0x9, 0x2, 0x24, 0x1, 0x0, 0x0, 0x0, 0x0, [{{0x9, 0x4, 0x0, 0x0, 0x12, 0x7, 0x1, 0x3, 0x0, "", {{{0x9, 0x5, 0x1, 0x2, 0x0, 0x0, 0x0, 0x0, ""}}, [{{0x9, 0x5, 0x82, 0x2, 0x0, 0x0, 0x0, 0x0, ""}}]}}}]}}]}}, 0x0)
 syz_usb_control_io$printer(r0, 0x0, 0x0)
-- 
cgit mrf-deployment