From a6f7cbf5fb30f259fe309ae21ee216487d8a4070 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 25 May 2022 16:27:40 -0700 Subject: [PATCH] seccomp: aarch64: fix USB ioctl struct sizes The ioctl allow list for the emulated xhci USB controller device was copied from the 32-bit ARM version, but the structure sizes are incorrect for 64-bit aarch64. Update the constants for ioctls that take a structure with a different size: - USBDEVFS_REAPURBNDELAY: struct usbdevfs_urb - USBDEVFS_SUBMITURB: struct usbdevfs_urb - USBDEVFS_CONTROL: struct usbdevfs_ctrltransfer BUG=chromium:1328120 TEST=Share USB device with Crostini on trogdor64 Change-Id: I45d69021257af55cfeaf72dd33a500a358adc5ee Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3670055 Reviewed-by: Stephen Boyd Tested-by: kokoro Commit-Queue: Daniel Verkamp --- seccomp/aarch64/xhci.policy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/seccomp/aarch64/xhci.policy b/seccomp/aarch64/xhci.policy index 48c66f0ee9..e304e3ab45 100644 --- a/seccomp/aarch64/xhci.policy +++ b/seccomp/aarch64/xhci.policy @@ -17,20 +17,20 @@ setsockopt: 1 bind: 1 socket: arg0 == AF_NETLINK # The following ioctls are: -# 0x4004550d == USBDEVFS_REAPURBNDELAY32 +# 0x4008550d == USBDEVFS_REAPURBNDELAY # 0x550b == USBDEVFS_DISCARDURB # 0x8004550f == USBDEVFS_CLAIMINTERFACE # 0x80045510 == USBDEVFS_RELEASEINTERFACE # 0x80045515 == USBDEVFS_CLEAR_HALT # 0x8004551a == USBDEVFS_GET_CAPABILITIES -# 0x802c550a == USBDEVFS_SUBMITURB -# 0xc0105500 == USBDEVFS_CONTROL +# 0x8038550a == USBDEVFS_SUBMITURB +# 0xc0185500 == USBDEVFS_CONTROL # 0x5514 == USBDEVFS_RESET # 0x80045505 == USBDEVFS_SETCONFIGURATION # 0x8108551b == USBDEVFS_DISCONNECT_CLAIM # 0x40085511 == USBDEVFS_CONNECTINFO # 0x80185520 == USBDEVFS_CONNINFO_EX -ioctl: arg1 == 0xc0105500 || arg1 == 0x802c550a || arg1 == 0x8004551a || arg1 == 0x4004550d || arg1 == 0x8004550f || arg1 == 0x80045510 || arg1 == 0x80045515 || arg1 == 0x550b || arg1 == 0x5514 || arg1 == 0x80045505 || arg1 == 0x8108551b || arg1 == 0x40085511 || arg1 == 0x80185520 +ioctl: arg1 == 0xc0185500 || arg1 == 0x8038550a || arg1 == 0x8004551a || arg1 == 0x4008550d || arg1 == 0x8004550f || arg1 == 0x80045510 || arg1 == 0x80045515 || arg1 == 0x550b || arg1 == 0x5514 || arg1 == 0x80045505 || arg1 == 0x8108551b || arg1 == 0x40085511 || arg1 == 0x80185520 fstat: 1 getrandom: 1 lseek: 1