From nobody Mon Feb 9 11:30:04 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