From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Bandan Das 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 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/2] usb-mtp: return incomplete transfer on a lstat failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kraxel@redhat.com, peter.maydell@linaro.org 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->dat= aset.size) { + /* + * Return an incomplete transfer if file size doesn't match + * for < 4G file or if lstat fails which will result in an i= ncorrect + * 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->tran= s, 0, 0, 0, 0); goto done; } - usb_mtp_update_object(parent, s->dataset.filename); + } } =20 --=20 2.19.2