From nobody Fri Nov 7 13:00:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538973123579483.06905881015734; Sun, 7 Oct 2018 21:32:03 -0700 (PDT) Received: from localhost ([::1]:44471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9ND8-0008Mf-Bg for importer@patchew.org; Mon, 08 Oct 2018 00:32:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9N9N-0006aP-HF for qemu-devel@nongnu.org; Mon, 08 Oct 2018 00:28:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g9N9I-0002Uq-Ub for qemu-devel@nongnu.org; Mon, 08 Oct 2018 00:28:09 -0400 Received: from mail2.static.mailgun.info ([104.130.122.2]:56269) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g9N9H-0002St-2R for qemu-devel@nongnu.org; Mon, 08 Oct 2018 00:28:04 -0400 Received: from cerberus.teal.tolva.net (c-73-252-167-134.hsd1.ca.comcast.net [73.252.167.134]) by mxa.mailgun.org with ESMTP id 5bbadcd2.7f33206c4170-smtp-out-n01; Mon, 08 Oct 2018 04:28:02 -0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg-relay.tolva.net; q=dns/txt; s=pic; t=1538972882; h=Content-Transfer-Encoding: Content-Type: MIME-Version: References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=eLaLVSLI+EIym1riIm7sDTJQPfDr5Kz0+1ZvaHl+Vl0=; b=ppAGN+x03rosPu1JsSX18F6AIwfNxk88/Mse95ywgITpi/LwtFvmy8dLpP4J7yzAp0UwWyXd UUPHCa8FyeAsHavxvi+25pKwUr/4BzsTe1FkJiJHMZ37uJWz5ROPTyrshnAyauM+cM5qLmi4 b5hx1EMAMDQY1M/X2BSqbppZAmU= X-Mailgun-Sending-Ip: 104.130.122.2 X-Mailgun-Sid: WyI5MDdkOCIsICJxZW11LWRldmVsQG5vbmdudS5vcmciLCAiN2Q3MzI5Il0= From: =?UTF-8?q?Cortland=20T=C3=B6lva?= To: qemu-devel@nongnu.org Date: Sun, 7 Oct 2018 21:27:46 -0700 Message-Id: <20181008042747.10130-2-cst@tolva.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181008042747.10130-1-cst@tolva.net> References: <20181008042747.10130-1-cst@tolva.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 104.130.122.2 Subject: [Qemu-devel] [PATCH 1/2] linux-user: Use calculated sizes for usbfs ioctls. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier , =?UTF-8?q?Cortland=20T=C3=B6lva?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Size calculation should have used the target struct. Fix the error by marking these ioctls as needing runtime size calcuation. Signed-off-by: Cortland T=C3=B6lva --- linux-user/syscall_defs.h | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index af91f9582d..2daa5ebdcc 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -863,31 +863,29 @@ struct target_pollfd { =20 #define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap) =20 -#if defined(CONFIG_USBFS) /* usb ioctls */ -#define TARGET_USBDEVFS_CONTROL TARGET_IOWR('U', 0, struct usbdevfs_ctrltr= ansfer) -#define TARGET_USBDEVFS_BULK TARGET_IOWR('U', 2, struct usbdevfs_bulktrans= fer) -#define TARGET_USBDEVFS_RESETEP TARGET_IOR('U', 3, int) -#define TARGET_USBDEVFS_SETINTERFACE TARGET_IOR('U', 4, struct usbdevfs_se= tinterface) -#define TARGET_USBDEVFS_SETCONFIGURATION TARGET_IOR('U', 5, int) -#define TARGET_USBDEVFS_GETDRIVER TARGET_IOW('U', 8, struct usbdevfs_getdr= iver) -#define TARGET_USBDEVFS_DISCSIGNAL TARGET_IOR('U', 14, struct usbdevfs_dis= connectsignal) -#define TARGET_USBDEVFS_CLAIMINTERFACE TARGET_IOR('U', 15, int) -#define TARGET_USBDEVFS_RELEASEINTERFACE TARGET_IOR('U', 16, int) -#define TARGET_USBDEVFS_CONNECTINFO TARGET_IOW('U', 17, struct usbdevfs_co= nnectinfo) -#define TARGET_USBDEVFS_IOCTL TARGET_IOWR('U', 18, struct usbdevfs_ioctl) -#define TARGET_USBDEVFS_HUB_PORTINFO TARGET_IOR('U', 19, struct usbdevfs_h= ub_portinfo) +#define TARGET_USBDEVFS_CONTROL TARGET_IOWRU('U', 0) +#define TARGET_USBDEVFS_BULK TARGET_IOWRU('U', 2) +#define TARGET_USBDEVFS_RESETEP TARGET_IORU('U', 3) +#define TARGET_USBDEVFS_SETINTERFACE TARGET_IORU('U', 4) +#define TARGET_USBDEVFS_SETCONFIGURATION TARGET_IORU('U', 5) +#define TARGET_USBDEVFS_GETDRIVER TARGET_IOWU('U', 8) +#define TARGET_USBDEVFS_DISCSIGNAL TARGET_IORU('U', 14) +#define TARGET_USBDEVFS_CLAIMINTERFACE TARGET_IORU('U', 15) +#define TARGET_USBDEVFS_RELEASEINTERFACE TARGET_IORU('U', 16) +#define TARGET_USBDEVFS_CONNECTINFO TARGET_IOWU('U', 17) +#define TARGET_USBDEVFS_IOCTL TARGET_IOWRU('U', 18) +#define TARGET_USBDEVFS_HUB_PORTINFO TARGET_IORU('U', 19) #define TARGET_USBDEVFS_RESET TARGET_IO('U', 20) -#define TARGET_USBDEVFS_CLEAR_HALT TARGET_IOR('U', 21, int) +#define TARGET_USBDEVFS_CLEAR_HALT TARGET_IORU('U', 21) #define TARGET_USBDEVFS_DISCONNECT TARGET_IO('U', 22) #define TARGET_USBDEVFS_CONNECT TARGET_IO('U', 23) -#define TARGET_USBDEVFS_CLAIM_PORT TARGET_IOR('U', 24, int) -#define TARGET_USBDEVFS_RELEASE_PORT TARGET_IOR('U', 25, int) -#define TARGET_USBDEVFS_GET_CAPABILITIES TARGET_IOR('U', 26, int) -#define TARGET_USBDEVFS_DISCONNECT_CLAIM TARGET_IOR('U', 27, struct usbdev= fs_disconnect_claim) -#define TARGET_USBDEVFS_DROP_PRIVILEGES TARGET_IOW('U', 30, int) +#define TARGET_USBDEVFS_CLAIM_PORT TARGET_IORU('U', 24) +#define TARGET_USBDEVFS_RELEASE_PORT TARGET_IORU('U', 25) +#define TARGET_USBDEVFS_GET_CAPABILITIES TARGET_IORU('U', 26) +#define TARGET_USBDEVFS_DISCONNECT_CLAIM TARGET_IORU('U', 27) +#define TARGET_USBDEVFS_DROP_PRIVILEGES TARGET_IOWU('U', 30) #define TARGET_USBDEVFS_GET_SPEED TARGET_IO('U', 31) -#endif /* CONFIG_USBFS */ =20 /* cdrom commands */ #define TARGET_CDROMPAUSE 0x5301 /* Pause Audio Operation */ --=20 2.17.1