SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usb-mtp: return incomplete transfer on a lstat failure

Browse Source 
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 <bsd@redhat.com>
Message-id: 20190306210409.14842-2-bsd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Bandan Das 2019-03-06 16:04:07 -05:00 committed by Gerd Hoffmann
parent 32694e98b8
commit c5ead51f90
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/usb/dev-mtp.c
View File

@ -1591,14 +1591,18 @@ done:
return ret; return ret;
} }
static void usb_mtp_update_object(MTPObject *parent, char *name) static int usb_mtp_update_object(MTPObject *parent, char *name)
{ {
int ret = -1;
MTPObject *o = MTPObject *o =
usb_mtp_object_lookup_name(parent, name, strlen(name)); usb_mtp_object_lookup_name(parent, name, strlen(name));
if (o) { if (o) {
lstat(o->path, &o->stat); ret = lstat(o->path, &o->stat);
} }
return ret;
} }
static void usb_mtp_write_data(MTPState *s) static void usb_mtp_write_data(MTPState *s)
@ -1655,13 +1659,18 @@ static void usb_mtp_write_data(MTPState *s)
if (d->write_status != WRITE_END) { if (d->write_status != WRITE_END) {
return; return;
} else { } else {
/* Only for < 4G file sizes */ /*
if (s->dataset.size != 0xFFFFFFFF && d->offset != s->dataset.size) { * Return an incomplete transfer if file size doesn't match
* for < 4G file or if lstat fails which will result in an incorrect
* file size
*/
if ((s->dataset.size != 0xFFFFFFFF &&
d->offset != s->dataset.size) ||
usb_mtp_update_object(parent, s->dataset.filename)) {
usb_mtp_queue_result(s, RES_INCOMPLETE_TRANSFER, d->trans, usb_mtp_queue_result(s, RES_INCOMPLETE_TRANSFER, d->trans,
0, 0, 0, 0); 0, 0, 0, 0);
goto done; goto done;
} }
usb_mtp_update_object(parent, s->dataset.filename);
} }
} }