From nobody Sun Nov 9 14:51:27 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 1550876434551306.3896639517178; Fri, 22 Feb 2019 15:00:34 -0800 (PST) Received: from localhost ([127.0.0.1]:58127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxJny-0007cV-4R for importer@patchew.org; Fri, 22 Feb 2019 18:00:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxJmb-0006t0-PG for qemu-devel@nongnu.org; Fri, 22 Feb 2019 17:59:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxJma-0006CG-Tn for qemu-devel@nongnu.org; Fri, 22 Feb 2019 17:59:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60606) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gxJma-0005P7-NR for qemu-devel@nongnu.org; Fri, 22 Feb 2019 17:59:04 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D4E683082208; Fri, 22 Feb 2019 22:49:52 +0000 (UTC) Received: from gigantic.usersys.redhat.com (helium.bos.redhat.com [10.18.17.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 689D519C58; Fri, 22 Feb 2019 22:49:52 +0000 (UTC) From: Bandan Das To: qemu-devel@nongnu.org Date: Fri, 22 Feb 2019 17:49:33 -0500 Message-Id: <20190222224934.5822-2-bsd@redhat.com> In-Reply-To: <20190222224934.5822-1-bsd@redhat.com> References: <20190222224934.5822-1-bsd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 22 Feb 2019 22:49:52 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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] [PATCH 1/2] usb-mtp: return incomplete transfer on a lstat failure 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@linaro.org, kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" MTP writes objects in small chunks and at the end gets the real file size to update the object metadata. If this fails for any reason, return an INCOMPLETE_TRANSFER to the initiator Spotted by Coverity: CID 1398651 Signed-off-by: Bandan Das --- hw/usb/dev-mtp.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index f1d20fa1b9..79f2cb8743 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1644,14 +1644,18 @@ done: return ret; } =20 -static void usb_mtp_update_object(MTPObject *parent, char *name) +static int usb_mtp_update_object(MTPObject *parent, char *name) { + int ret =3D -1; + MTPObject *o =3D usb_mtp_object_lookup_name(parent, name, strlen(name)); =20 if (o) { - lstat(o->path, &o->stat); + ret =3D lstat(o->path, &o->stat); } + + return ret; } =20 static void usb_mtp_write_data(MTPState *s) @@ -1708,14 +1712,19 @@ static void usb_mtp_write_data(MTPState *s) if (d->write_status !=3D WRITE_END) { return; } else { - /* Only for < 4G file sizes */ - if (s->dataset.size !=3D 0xFFFFFFFF && d->offset !=3D s->datas= et.size) { + /* + * Return an incomplete transfer if file size doesn't match + * for < 4G file or if lstat fails which will result in an inc= orrect + * file size + */ + if ((s->dataset.size !=3D 0xFFFFFFFF && + d->offset !=3D s->dataset.size) || + usb_mtp_update_object(parent, s->dataset.filename)) { usb_mtp_queue_result(s, RES_INCOMPLETE_TRANSFER, d->trans, 0, 0, 0, 0); goto done; } - usb_mtp_update_object(parent, s->dataset.filename); + } } =20 --=20 2.19.2