Received: from eggs.gnu.org ([209.51.188.92]:44040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG3nU-0000nJ-6d for qemu-devel@nongnu.org; Mon, 15 Apr 2019 11:45:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hG3nR-0007m6-Fa for qemu-devel@nongnu.org; Mon, 15 Apr 2019 11:45:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35046) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hG3nO-0007gJ-Lu for qemu-devel@nongnu.org; Mon, 15 Apr 2019 11:45:23 -0400 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 15 Apr 2019 16:45:03 +0100 Message-Id: <20190415154503.6758-4-berrange@redhat.com> In-Reply-To: <20190415154503.6758-1-berrange@redhat.com> References: <20190415154503.6758-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 3/3] usb-mtp: fix alignment of access of ObjectInfo filename field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Bandan Das , Thomas Huth , Greg Kurz , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=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 --- 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 6b7d1296e4..963449ec7d 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, U= SBPacket *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 *ar= r) =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.20.1