From c62f41681ce2974680aa2603e1dbb3646986b6b6 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 20 Jun 2019 09:21:40 -0700 Subject: usb: update USBDEVFS_CONNINFO_EX value to new size The layout of struct usbfs_conninfo_ex was changed in the final revision of the patch, so the corresponding ioctl number needs to change to match, since the parameter size is encoded in the ioctl. The new size is 0x18 or 24, which matches the struct usbfs_conninfo_ex layout with 7 ports. BUG=chromium:977020 TEST=Attach Android device to Linux VM on nami Change-Id: Iec60b4c04880d7d2c71fdea49cfdf7fb5a75f5c6 Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1669530 Tested-by: kokoro Reviewed-by: Dylan Reid Reviewed-by: Dmitry Torokhov Commit-Queue: Dmitry Torokhov --- seccomp/arm/xhci.policy | 4 ++-- seccomp/x86_64/xhci.policy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'seccomp') diff --git a/seccomp/arm/xhci.policy b/seccomp/arm/xhci.policy index 857cecc..4fca144 100644 --- a/seccomp/arm/xhci.policy +++ b/seccomp/arm/xhci.policy @@ -37,8 +37,8 @@ uname: 1 # 0x80045505 == USBDEVFS_SETCONFIGURATION # 0x8108551b == USBDEVFS_DISCONNECT_CLAIM # 0x40085511 == USBDEVFS_CONNECTINFO -# 0x80305520 == USBDEVFS_CONNINFO_EX -ioctl: arg1 == 0xc0105500 || arg1 == 0x802c550a || arg1 == 0x8004551a || arg1 == 0x4004550d || arg1 == 0x8004550f || arg1 == 0x80045510 || arg1 == 0x550b || arg1 == 0x5514 || arg1 == 0x80045505 || arg1 == 0x8108551b || arg1 == 0x40085511 || arg1 == 0x80305520 +# 0x80185520 == USBDEVFS_CONNINFO_EX +ioctl: arg1 == 0xc0105500 || arg1 == 0x802c550a || arg1 == 0x8004551a || arg1 == 0x4004550d || arg1 == 0x8004550f || arg1 == 0x80045510 || arg1 == 0x550b || arg1 == 0x5514 || arg1 == 0x80045505 || arg1 == 0x8108551b || arg1 == 0x40085511 || arg1 == 0x80185520 fstat: 1 sigaltstack: 1 recvmsg: 1 diff --git a/seccomp/x86_64/xhci.policy b/seccomp/x86_64/xhci.policy index 2d81b74..98e3335 100644 --- a/seccomp/x86_64/xhci.policy +++ b/seccomp/x86_64/xhci.policy @@ -35,8 +35,8 @@ uname: 1 # 0x80045505 == USBDEVFS_SETCONFIGURATION # 0x8108551b == USBDEVFS_DISCONNECT_CLAIM # 0x40085511 == USBDEVFS_CONNECTINFO -# 0x80305520 == USBDEVFS_CONNINFO_EX -ioctl: arg1 == 0xc0185500 || arg1 == 0x41045508 || arg1 == 0x8004550f || arg1 == 0x4008550d || arg1 == 0x8004551a || arg1 == 0x550b || arg1 == 0x80045510 || arg1 == 0x8038550a || arg1 == 0x5514 || arg1 == 0x80045505 || arg1 == 0x8108551b || arg1 == 0x40085511 || arg1 == 0x80305520 +# 0x80185520 == USBDEVFS_CONNINFO_EX +ioctl: arg1 == 0xc0185500 || arg1 == 0x41045508 || arg1 == 0x8004550f || arg1 == 0x4008550d || arg1 == 0x8004551a || arg1 == 0x550b || arg1 == 0x80045510 || arg1 == 0x8038550a || arg1 == 0x5514 || arg1 == 0x80045505 || arg1 == 0x8108551b || arg1 == 0x40085511 || arg1 == 0x80185520 fstat: 1 sigaltstack: 1 recvmsg: 1 -- cgit 1.4.1