From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:34981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG4qe-0000rH-1a for qemu-devel@nongnu.org; Mon, 15 Apr 2019 12:52:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hG4qc-0002BO-QE for qemu-devel@nongnu.org; Mon, 15 Apr 2019 12:52:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41870) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hG4qc-0002B2-Dp for qemu-devel@nongnu.org; Mon, 15 Apr 2019 12:52:46 -0400 From: Bandan Das References: <20190415154503.6758-1-berrange@redhat.com> Date: Mon, 15 Apr 2019 12:52:41 -0400 In-Reply-To: <20190415154503.6758-1-berrange@redhat.com> ("Daniel P. \=\?utf-8\?Q\?Berrang\=C3\=A9\=22's\?\= message of "Mon, 15 Apr 2019 16:45:00 +0100") Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 0/3] usb-mtp: fix ObjectInfo request handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. =?utf-8?Q?Berrang=C3=A9?=" Cc: qemu-devel@nongnu.org, Gerd Hoffmann , Thomas Huth , Greg Kurz , Peter Maydell Daniel P. Berrang=C3=A9 writes: > Two previous attempts to fix this due to GCC 9 highlighting > unaligned data access. My attempt: > > https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg07763.html > > And a previous one: > > https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg07923.html > https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg00162.html > > There are a number of bugs in the USB MTP usb_mtp_write_metadata > method handling the filename character set conversion. > > The 2nd patch in this series is a security flaw fix since the > code was not correctly validating guest provided data length. > > I've been unable to figure out how to exercise the codepath that > calls usb_mtp_write_metadata. At a guess, it looks like something > that should be called when writing to a file from a guest, but the > GNOME GVFS MTP driver doesn't provide write support. Using the > command line MTP tools "mtp-sendfile" command results in an > protocol error > > # mtp-sendfile foo eek.txt > libmtp version: 1.1.14 > The store is read only by default. Are you trying something like: -device usb-mtp,rootdir=3D/code/mtpshare,readonly=3Dfalse ? BTW, I also found a bug introduced by a recent commit which will return an incomplete transfer for smaller file sizes. > Device 0 (VID=3D46f4 and PID=3D0004) is UNKNOWN in libmtp v1.1.14. > Please report this VID/PID and the device model to the libmtp develop= ment team > PTP_ERROR_IO: failed to open session, trying again after resetting US= B interface > LIBMTP libusb: Attempt to reset device > Sending foo to eek.txt > type: , 44 > Sending file... > > Error sending file. > Error 2: PTP Layer error 02ff: send_file_object_info(): Could not sen= d object info. > Error 2: Error 02ff: PTP I/O Error > ERROR: Could not close session! > > And QEMU tracing show unexpected requests > > 26582@1555340076151600935 usb_mtp_command dev 4, code 0x9803, trans 0= x18, args 0x11, 0xdc04, 0x0, 0x0, 0x0 > 26582@1555340076151619955 usb_mtp_xfer dev 4, ep 2, 20/20 > 26582@1555340076154138556 usb_mtp_data_in dev 4, trans 0x18, len 8 > 26582@1555340076154150689 usb_mtp_xfer dev 4, ep 1, 20/512 > 26582@1555340076156654311 usb_mtp_success dev 4, trans 0x18, args 0x0= , 0x0 > 26582@1555340076156667764 usb_mtp_xfer dev 4, ep 1, 12/512 > 26582@1555340076159215930 usb_mtp_command dev 4, code 0x100c, trans 0= x19, args 0x10001, 0xc, 0x0, 0x0, 0x0 > 26582@1555340076159229610 usb_mtp_xfer dev 4, ep 2, 20/20 > 26582@1555340076164166196 usb_mtp_stall dev 4, reason: awaiting data-= out > 26582@1555340076167156367 usb_mtp_stall dev 4, reason: transaction in= flight > 26582@1555340076170108336 usb_mtp_stall dev 4, reason: unknown contro= l request > 26582@1555340076172606798 usb_mtp_stall dev 4, reason: unknown contro= l request > > Perhaps a Windows guest can exercise this, but I don't have a modern > Windows install with MTP support. > > Thus this series is merely compile tested. > > Daniel P. Berrang=C3=A9 (3): > usb-mtp: fix string length for filename when writing metadata > usb-mtp: fix bounds check for guest provided filename > usb-mtp: fix alignment of access of ObjectInfo filename field > > hw/usb/dev-mtp.c | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26978C10F0E for ; Mon, 15 Apr 2019 16:53:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB2642077C for ; Mon, 15 Apr 2019 16:53:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB2642077C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:53236 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG4rR-0001CW-A3 for qemu-devel@archiver.kernel.org; Mon, 15 Apr 2019 12:53:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG4qe-0000rH-1a for qemu-devel@nongnu.org; Mon, 15 Apr 2019 12:52:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hG4qc-0002BO-QE for qemu-devel@nongnu.org; Mon, 15 Apr 2019 12:52:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41870) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hG4qc-0002B2-Dp for qemu-devel@nongnu.org; Mon, 15 Apr 2019 12:52:46 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A44E8300519C; Mon, 15 Apr 2019 16:52:45 +0000 (UTC) Received: from gigantic.usersys.redhat.com (helium.bos.redhat.com [10.18.17.132]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C6A7E608C2; Mon, 15 Apr 2019 16:52:42 +0000 (UTC) From: Bandan Das To: Daniel P. =?utf-8?Q?Berrang=C3=A9?= References: <20190415154503.6758-1-berrange@redhat.com> Date: Mon, 15 Apr 2019 12:52:41 -0400 In-Reply-To: <20190415154503.6758-1-berrange@redhat.com> ("Daniel P. \=\?utf-8\?Q\?Berrang\=C3\=A9\=22's\?\= message of "Mon, 15 Apr 2019 16:45:00 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 15 Apr 2019 16:52:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH 0/3] usb-mtp: fix ObjectInfo request handling 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: Peter Maydell , Thomas Huth , Greg Kurz , qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190415165241.83eFL5atBFYezmQCJ3a7tsvEPqW88LH0_Lu_h2V5Wvs@z> Daniel P. Berrang=C3=A9 writes: > Two previous attempts to fix this due to GCC 9 highlighting > unaligned data access. My attempt: > > https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg07763.html > > And a previous one: > > https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg07923.html > https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg00162.html > > There are a number of bugs in the USB MTP usb_mtp_write_metadata > method handling the filename character set conversion. > > The 2nd patch in this series is a security flaw fix since the > code was not correctly validating guest provided data length. > > I've been unable to figure out how to exercise the codepath that > calls usb_mtp_write_metadata. At a guess, it looks like something > that should be called when writing to a file from a guest, but the > GNOME GVFS MTP driver doesn't provide write support. Using the > command line MTP tools "mtp-sendfile" command results in an > protocol error > > # mtp-sendfile foo eek.txt > libmtp version: 1.1.14 > The store is read only by default. Are you trying something like: -device usb-mtp,rootdir=3D/code/mtpshare,readonly=3Dfalse ? BTW, I also found a bug introduced by a recent commit which will return an incomplete transfer for smaller file sizes. > Device 0 (VID=3D46f4 and PID=3D0004) is UNKNOWN in libmtp v1.1.14. > Please report this VID/PID and the device model to the libmtp develop= ment team > PTP_ERROR_IO: failed to open session, trying again after resetting US= B interface > LIBMTP libusb: Attempt to reset device > Sending foo to eek.txt > type: , 44 > Sending file... > > Error sending file. > Error 2: PTP Layer error 02ff: send_file_object_info(): Could not sen= d object info. > Error 2: Error 02ff: PTP I/O Error > ERROR: Could not close session! > > And QEMU tracing show unexpected requests > > 26582@1555340076151600935 usb_mtp_command dev 4, code 0x9803, trans 0= x18, args 0x11, 0xdc04, 0x0, 0x0, 0x0 > 26582@1555340076151619955 usb_mtp_xfer dev 4, ep 2, 20/20 > 26582@1555340076154138556 usb_mtp_data_in dev 4, trans 0x18, len 8 > 26582@1555340076154150689 usb_mtp_xfer dev 4, ep 1, 20/512 > 26582@1555340076156654311 usb_mtp_success dev 4, trans 0x18, args 0x0= , 0x0 > 26582@1555340076156667764 usb_mtp_xfer dev 4, ep 1, 12/512 > 26582@1555340076159215930 usb_mtp_command dev 4, code 0x100c, trans 0= x19, args 0x10001, 0xc, 0x0, 0x0, 0x0 > 26582@1555340076159229610 usb_mtp_xfer dev 4, ep 2, 20/20 > 26582@1555340076164166196 usb_mtp_stall dev 4, reason: awaiting data-= out > 26582@1555340076167156367 usb_mtp_stall dev 4, reason: transaction in= flight > 26582@1555340076170108336 usb_mtp_stall dev 4, reason: unknown contro= l request > 26582@1555340076172606798 usb_mtp_stall dev 4, reason: unknown contro= l request > > Perhaps a Windows guest can exercise this, but I don't have a modern > Windows install with MTP support. > > Thus this series is merely compile tested. > > Daniel P. Berrang=C3=A9 (3): > usb-mtp: fix string length for filename when writing metadata > usb-mtp: fix bounds check for guest provided filename > usb-mtp: fix alignment of access of ObjectInfo filename field > > hw/usb/dev-mtp.c | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-)