From nobody Mon Feb 9 10:12:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556867082; cv=none; d=zoho.com; s=zohoarc; b=QzGS/Ct3gkx1I2KmmrVJmxXfwFKLobGTl1iE2Jk6ijzCL6pmeTR5a63M4SdI0iS0C/s8FPGZncOoUlSGobyJ0MAzN50l8k1cpibbuZF/xjimARNCywUbXgBGKIyN+GSmN1rBaxiOGkdv/kytS9Xcmee2r6MQhIzWiT1qw8FE9kE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556867082; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=B+mB4qHg5CxSXpLpKWt1yMTZITPSQ00XR3NtUpUjxHM=; b=HV4JidK35ionIARbw+Rrys3bHMran4eUF2Tj/Qqq3sVS2HTOMjrUTqFbqQ2+D7SUtrz2zidvDZDw6uqkGTGZ0R2FiDf4C/02LeuccNhuDbSmswHSFA8+I0UiJruAEq9b6ZZLcjwjU2AKZPcG2zZ9kQ0rAb0jq5CuB8bzIq+CLi0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556867082760684.5468853556658; Fri, 3 May 2019 00:04:42 -0700 (PDT) Received: from localhost ([127.0.0.1]:35659 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMSFL-0007al-Nq for importer@patchew.org; Fri, 03 May 2019 03:04:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMSAq-0003n1-S9 for qemu-devel@nongnu.org; Fri, 03 May 2019 03:00:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMSAp-0006Ee-Nw for qemu-devel@nongnu.org; Fri, 03 May 2019 03:00:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33836) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMSAp-0006Dt-Ex for qemu-devel@nongnu.org; Fri, 03 May 2019 02:59:59 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CF27430BC73A; Fri, 3 May 2019 06:59:57 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 027671001E91; Fri, 3 May 2019 06:59:54 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2B0B61752B; Fri, 3 May 2019 08:59:54 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 3 May 2019 08:59:49 +0200 Message-Id: <20190503065954.17069-3-kraxel@redhat.com> In-Reply-To: <20190503065954.17069-1-kraxel@redhat.com> References: <20190503065954.17069-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 03 May 2019 06:59:57 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/7] usb-mtp: fix alignment of access of ObjectInfo filename field 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: Gerd Hoffmann , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 The ObjectInfo struct's "filename" field is following a uint8_t field in a packed struct and thus has bad alignment for a 16-bit field. Switch the field to to uint8_t and use the helper function for accessing unaligned 16-bit data. Note that although the MTP spec specifies big endian, when transported over the USB protocol, data is little endian. Signed-off-by: Daniel P. Berrang=C3=A9 Message-id: 20190415154503.6758-4-berrange@redhat.com Signed-off-by: Gerd Hoffmann --- hw/usb/dev-mtp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 6b7d1296e430..963449ec7de8 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -226,7 +226,7 @@ typedef struct { uint32_t assoc_desc; uint32_t seq_no; /*unused*/ uint8_t length; /*part of filename field*/ - uint16_t filename[0]; + uint8_t filename[0]; /* UTF-16 encoded */ char date_created[0]; /*unused*/ char date_modified[0]; /*unused*/ char keywords[0]; /*unused*/ @@ -1551,7 +1551,7 @@ static void usb_mtp_cancel_packet(USBDevice *dev, USB= Packet *p) fprintf(stderr, "%s\n", __func__); } =20 -static char *utf16_to_str(uint8_t len, uint16_t *arr) +static char *utf16_to_str(uint8_t len, uint8_t *str16) { wchar_t *wstr =3D g_new0(wchar_t, len + 1); int count, dlen; @@ -1559,7 +1559,7 @@ static char *utf16_to_str(uint8_t len, uint16_t *arr) =20 for (count =3D 0; count < len; count++) { /* FIXME: not working for surrogate pairs */ - wstr[count] =3D (wchar_t)arr[count]; + wstr[count] =3D lduw_le_p(str16 + (count * 2)); } wstr[count] =3D 0; =20 --=20 2.18.1