From nobody Sun Feb 8 14:31:47 2026 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525686404549835.5523479649635; Mon, 7 May 2018 02:46:44 -0700 (PDT) Received: from localhost ([::1]:44926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFcj8-0003Rs-B8 for importer@patchew.org; Mon, 07 May 2018 05:46:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFchZ-0002jG-Qd for qemu-devel@nongnu.org; Mon, 07 May 2018 05:45:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFchY-00059R-A9 for qemu-devel@nongnu.org; Mon, 07 May 2018 05:45:01 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51484 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 1fFchY-00057Z-5U for qemu-devel@nongnu.org; Mon, 07 May 2018 05:45:00 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B423A818F6E6 for ; Mon, 7 May 2018 09:44:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-99.ams2.redhat.com [10.36.116.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C53F215CDAA; Mon, 7 May 2018 09:44:49 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C049851BA6; Mon, 7 May 2018 11:44:48 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 7 May 2018 11:44:46 +0200 Message-Id: <20180507094448.32386-2-kraxel@redhat.com> In-Reply-To: <20180507094448.32386-1-kraxel@redhat.com> References: <20180507094448.32386-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 07 May 2018 09:44:53 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 07 May 2018 09:44:53 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 1/3] usb-mtp: Add some NULL checks for issues pointed out by coverity 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: Bandan Das , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Bandan Das CID 1390578: In usb_mtp_write_metadata, parent can never be NULL but just in case, add an assert CID 1390592: Check for o->format only if o !=3DNULL CID 1390604: Check s->data_out !=3D NULL in usb_mtp_handle_data Signed-off-by: Bandan Das Message-id: 20180503192028.14353-2-bsd@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 6ecf70a79b..24cff640c0 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1446,8 +1446,7 @@ static void usb_mtp_command(MTPState *s, MTPControl *= c) if (o =3D=3D NULL) { usb_mtp_queue_result(s, RES_INVALID_OBJECT_HANDLE, c->tran= s, 0, 0, 0, 0); - } - if (o->format !=3D FMT_ASSOCIATION) { + } else if (o->format !=3D FMT_ASSOCIATION) { usb_mtp_queue_result(s, RES_INVALID_PARENT_OBJECT, c->tran= s, 0, 0, 0, 0); } @@ -1660,6 +1659,7 @@ static void usb_mtp_write_metadata(MTPState *s) uint32_t next_handle =3D s->next_handle; =20 assert(!s->write_pending); + assert(p !=3D NULL); =20 utf16_to_str(dataset->length, dataset->filename, filename); =20 @@ -1838,7 +1838,7 @@ static void usb_mtp_handle_data(USBDevice *dev, USBPa= cket *p) p->status =3D USB_RET_STALL; return; } - if (s->data_out && !s->data_out->first) { + if ((s->data_out !=3D NULL) && !s->data_out->first) { container_type =3D TYPE_DATA; } else { usb_packet_copy(p, &container, sizeof(container)); --=20 2.9.3 From nobody Sun Feb 8 14:31:47 2026 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15256865805112.152495201246893; Mon, 7 May 2018 02:49:40 -0700 (PDT) Received: from localhost ([::1]:44936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFcm3-0005Mk-NL for importer@patchew.org; Mon, 07 May 2018 05:49:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFchZ-0002jF-QX for qemu-devel@nongnu.org; Mon, 07 May 2018 05:45:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFchY-00059Z-9u for qemu-devel@nongnu.org; Mon, 07 May 2018 05:45:01 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:33138 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 1fFchY-00057a-5Z for qemu-devel@nongnu.org; Mon, 07 May 2018 05:45:00 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A8558401DEA4 for ; Mon, 7 May 2018 09:44:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-99.ams2.redhat.com [10.36.116.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63BF02023227; Mon, 7 May 2018 09:44:49 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C91B951BA7; Mon, 7 May 2018 11:44:48 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 7 May 2018 11:44:47 +0200 Message-Id: <20180507094448.32386-3-kraxel@redhat.com> In-Reply-To: <20180507094448.32386-1-kraxel@redhat.com> References: <20180507094448.32386-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 07 May 2018 09:44:53 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 07 May 2018 09:44:53 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 2/3] usb-mtp: Unconditionally check for the readonly bit 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: Bandan Das , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Bandan Das Currently, it's only being checked if desc is NULL and so write support breaks upon specifying desc Signed-off-by: Bandan Das Message-id: 20180503192028.14353-3-bsd@redhat.com Signed-off-by: Gerd Hoffmann --- hw/usb/dev-mtp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 24cff640c0..3d59fe4944 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1948,16 +1948,17 @@ static void usb_mtp_realize(USBDevice *dev, Error *= *errp) return; } s->desc =3D strrchr(s->root, '/'); - /* Mark store as RW */ - if (!s->readonly) { - s->flags |=3D (1 << MTP_FLAG_WRITABLE); - } if (s->desc && s->desc[0]) { s->desc =3D g_strdup(s->desc + 1); } else { s->desc =3D g_strdup("none"); } } + /* Mark store as RW */ + if (!s->readonly) { + s->flags |=3D (1 << MTP_FLAG_WRITABLE); + } + } =20 static const VMStateDescription vmstate_usb_mtp =3D { --=20 2.9.3 From nobody Sun Feb 8 14:31:47 2026 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1525686744911253.4057850160691; Mon, 7 May 2018 02:52:24 -0700 (PDT) Received: from localhost ([::1]:44954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFcoi-0007mG-4m for importer@patchew.org; Mon, 07 May 2018 05:52:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFchZ-0002jH-Qv for qemu-devel@nongnu.org; Mon, 07 May 2018 05:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFchW-00058Z-PJ for qemu-devel@nongnu.org; Mon, 07 May 2018 05:45:01 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:59168 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 1fFchW-00057b-KY for qemu-devel@nongnu.org; Mon, 07 May 2018 05:44:58 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 998C6406C776 for ; Mon, 7 May 2018 09:44:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-99.ams2.redhat.com [10.36.116.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63C8C215CDA7; Mon, 7 May 2018 09:44:49 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D0B4251BA8; Mon, 7 May 2018 11:44:48 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 7 May 2018 11:44:48 +0200 Message-Id: <20180507094448.32386-4-kraxel@redhat.com> In-Reply-To: <20180507094448.32386-1-kraxel@redhat.com> References: <20180507094448.32386-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 07 May 2018 09:44:53 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 07 May 2018 09:44:53 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 3/3] usb-host: skip open on pending postload bh 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" usb-host emulates a device unplug after live migration, because the device state is unknown and unplug/replug makes sure the guest re-initializes the device into a working state. This can't be done in post-load though, so post-load just schedules a bottom half which executes after vmload is complete. It can happen that the device autoscan timer hits the race window between scheduling and running the bottom half, which in turn can triggers an assert(). Fix that issue by just ignoring the usb_host_open() call in case the bottom half didn't execute yet. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1572851 Signed-off-by: Gerd Hoffmann Message-id: 20180503062932.17233-1-kraxel@redhat.com --- hw/usb/host-libusb.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index dc0a8fe295..f31e9cbbb8 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -102,6 +102,7 @@ struct USBHostDevice { /* callbacks & friends */ QEMUBH *bh_nodev; QEMUBH *bh_postld; + bool bh_postld_pending; Notifier exit; =20 /* request queues */ @@ -870,6 +871,10 @@ static int usb_host_open(USBHostDevice *s, libusb_devi= ce *dev) int rc; Error *local_err =3D NULL; =20 + if (s->bh_postld_pending) { + return -1; + } + trace_usb_host_open_started(bus_num, addr); =20 if (s->dh !=3D NULL) { @@ -1528,6 +1533,7 @@ static void usb_host_post_load_bh(void *opaque) if (udev->attached) { usb_device_detach(udev); } + dev->bh_postld_pending =3D false; usb_host_auto_check(NULL); } =20 @@ -1539,6 +1545,7 @@ static int usb_host_post_load(void *opaque, int versi= on_id) dev->bh_postld =3D qemu_bh_new(usb_host_post_load_bh, dev); } qemu_bh_schedule(dev->bh_postld); + dev->bh_postld_pending =3D true; return 0; } =20 --=20 2.9.3