From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJkRD-0006Fr-1c for qemu-devel@nongnu.org; Fri, 18 May 2018 14:49:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJkR9-0008Bt-63 for qemu-devel@nongnu.org; Fri, 18 May 2018 14:49:11 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49114 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fJkR9-0008BY-07 for qemu-devel@nongnu.org; Fri, 18 May 2018 14:49:07 -0400 From: Bandan Das References: <20180507094448.32386-1-kraxel@redhat.com> <20180507094448.32386-2-kraxel@redhat.com> Date: Fri, 18 May 2018 14:49:03 -0400 In-Reply-To: (Bandan Das's message of "Fri, 18 May 2018 14:22:59 -0400") Message-ID: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v2] usb-mtp: Return error on suspicious TYPE_DATA packet from initiator List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Gerd Hoffmann , QEMU Developers CID 1390604 If the initiator sends a packet with TYPE_DATA set without initiating a CMD_GET_OBJECT_INFO first, then usb_mtp_get_data can trip on a null s->data_out. Signed-off-by: Bandan Das --- hw/usb/dev-mtp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 3d59fe4944..28384ea3b0 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1696,6 +1696,11 @@ static void usb_mtp_get_data(MTPState *s, mtp_container *container, uint64_t dlen; uint32_t data_len = p->iov.size; + if (!d) { + usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, 0, + 0, 0, 0, 0); + return; + } if (d->first) { /* Total length of incoming data */ d->length = cpu_to_le32(container->length) - sizeof(mtp_container); -- 2.14.3