motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 02:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb-mtp: fix some usb_mtp_write_data return paths

Browse source 
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 <bsd@redhat.com>
Message-id: 20190306210409.14842-3-bsd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Bandan Das 2019-03-06 16:04:08 -05:00 • committed by Gerd Hoffmann
parent c5ead51f90
commit 298ac63c44
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hw/usb/dev-mtp.c
View file

@ -1605,7 +1605,7 @@ static int usb_mtp_update_object(MTPObject *parent, char *name)
return ret; return ret;
} }
static void usb_mtp_write_data(MTPState *s) static int usb_mtp_write_data(MTPState *s)
{ {
MTPData *d = s->data_out; MTPData *d = s->data_out;
MTPObject *parent = MTPObject *parent =
@ -1613,6 +1613,7 @@ static void usb_mtp_write_data(MTPState *s)
char *path = NULL; char *path = NULL;
uint64_t rc; uint64_t rc;
mode_t mask = 0644; mode_t mask = 0644;
int ret = 0;
assert(d != NULL); assert(d != NULL);
@ -1621,13 +1622,13 @@ static void usb_mtp_write_data(MTPState *s)
if (!parent || !s->write_pending) { if (!parent || !s->write_pending) {
usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, d->trans, usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, d->trans,
0, 0, 0, 0); 0, 0, 0, 0);
return; return 1;
} }
if (s->dataset.filename) { if (s->dataset.filename) {
path = g_strdup_printf("%s/%s", parent->path, s->dataset.filename); path = g_strdup_printf("%s/%s", parent->path, s->dataset.filename);
if (s->dataset.format == FMT_ASSOCIATION) { if (s->dataset.format == FMT_ASSOCIATION) {
d->fd = mkdir(path, mask); ret = mkdir(path, mask);
goto free; goto free;
} }
d->fd = open(path, O_CREAT | O_WRONLY | d->fd = open(path, O_CREAT | O_WRONLY |
@ -1657,7 +1658,8 @@ static void usb_mtp_write_data(MTPState *s)
goto done; goto done;
} }
if (d->write_status != WRITE_END) { if (d->write_status != WRITE_END) {
return; g_free(path);
return ret;
} else { } else {
/* /*
* Return an incomplete transfer if file size doesn't match * Return an incomplete transfer if file size doesn't match
@ -1685,12 +1687,14 @@ done:
*/ */
if (d->fd != -1) { if (d->fd != -1) {
close(d->fd); close(d->fd);
d->fd = -1;
} }
free: free:
g_free(s->dataset.filename); g_free(s->dataset.filename);
s->dataset.size = 0; s->dataset.size = 0;
g_free(path); g_free(path);
s->write_pending = false; s->write_pending = false;
return ret;
} }
static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen)
@ -1727,14 +1731,12 @@ static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen)
s->write_pending = true; s->write_pending = true;
if (s->dataset.format == FMT_ASSOCIATION) { if (s->dataset.format == FMT_ASSOCIATION) {
usb_mtp_write_data(s); if (usb_mtp_write_data(s)) {
/* next_handle will be allocated to the newly created dir */ /* next_handle will be allocated to the newly created dir */
if (d->fd == -1) {
usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, usb_mtp_queue_result(s, RES_STORE_FULL, d->trans,
0, 0, 0, 0); 0, 0, 0, 0);
return; return;
} }
d->fd = -1;
} }
usb_mtp_queue_result(s, RES_OK, d->trans, 3, QEMU_STORAGE_ID, usb_mtp_queue_result(s, RES_OK, d->trans, 3, QEMU_STORAGE_ID,