From nobody Sun Nov 9 22:30:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551952718434696.2227903259708; Thu, 7 Mar 2019 01:58:38 -0800 (PST) Received: from localhost ([127.0.0.1]:48343 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1pnP-0000H0-HI for importer@patchew.org; Thu, 07 Mar 2019 04:58:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1pjl-0005aq-CN for qemu-devel@nongnu.org; Thu, 07 Mar 2019 04:54:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1pjk-0007tC-I8 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 04:54:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40564) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1pjk-0007sW-88 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 04:54:48 -0500 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 8513386679 for ; Thu, 7 Mar 2019 09:54:47 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-211.ams2.redhat.com [10.36.116.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4034611C0; Thu, 7 Mar 2019 09:54:42 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 040FB17476; Thu, 7 Mar 2019 10:54:42 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 10:54:39 +0100 Message-Id: <20190307095441.31921-3-kraxel@redhat.com> In-Reply-To: <20190307095441.31921-1-kraxel@redhat.com> References: <20190307095441.31921-1-kraxel@redhat.com> 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.26]); Thu, 07 Mar 2019 09:54:47 +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: [Qemu-devel] [PULL 2/4] usb-mtp: fix some usb_mtp_write_data return paths 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" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Bandan Das During a write, free up the "path" before getting more data. Also, while we at it, remove the confusing usage of d->fd for storing mkdir status Spotted by Coverity: CID 1398642 Signed-off-by: Bandan Das Message-id: 20190306210409.14842-3-bsd@redhat.com Signed-off-by: Gerd Hoffmann --- hw/usb/dev-mtp.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 4dde14fc7887..1f22284949df 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1605,7 +1605,7 @@ static int usb_mtp_update_object(MTPObject *parent, c= har *name) return ret; } =20 -static void usb_mtp_write_data(MTPState *s) +static int usb_mtp_write_data(MTPState *s) { MTPData *d =3D s->data_out; MTPObject *parent =3D @@ -1613,6 +1613,7 @@ static void usb_mtp_write_data(MTPState *s) char *path =3D NULL; uint64_t rc; mode_t mask =3D 0644; + int ret =3D 0; =20 assert(d !=3D NULL); =20 @@ -1621,13 +1622,13 @@ static void usb_mtp_write_data(MTPState *s) if (!parent || !s->write_pending) { usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, d->trans, 0, 0, 0, 0); - return; + return 1; } =20 if (s->dataset.filename) { path =3D g_strdup_printf("%s/%s", parent->path, s->dataset.fil= ename); if (s->dataset.format =3D=3D FMT_ASSOCIATION) { - d->fd =3D mkdir(path, mask); + ret =3D mkdir(path, mask); goto free; } d->fd =3D open(path, O_CREAT | O_WRONLY | @@ -1657,7 +1658,8 @@ static void usb_mtp_write_data(MTPState *s) goto done; } if (d->write_status !=3D WRITE_END) { - return; + g_free(path); + return ret; } else { /* * Return an incomplete transfer if file size doesn't match @@ -1685,12 +1687,14 @@ done: */ if (d->fd !=3D -1) { close(d->fd); + d->fd =3D -1; } free: g_free(s->dataset.filename); s->dataset.size =3D 0; g_free(path); s->write_pending =3D false; + return ret; } =20 static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) @@ -1727,14 +1731,12 @@ static void usb_mtp_write_metadata(MTPState *s, uin= t64_t dlen) s->write_pending =3D true; =20 if (s->dataset.format =3D=3D FMT_ASSOCIATION) { - usb_mtp_write_data(s); - /* next_handle will be allocated to the newly created dir */ - if (d->fd =3D=3D -1) { + if (usb_mtp_write_data(s)) { + /* next_handle will be allocated to the newly created dir */ usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, 0, 0, 0, 0); return; } - d->fd =3D -1; } =20 usb_mtp_queue_result(s, RES_OK, d->trans, 3, QEMU_STORAGE_ID, --=20 2.18.1