[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/6] usb-mtp: fix error conditions for write operatio
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 1/6] usb-mtp: fix error conditions for write operation |
Date: |
Mon, 17 Sep 2018 11:56:13 +0200 |
From: Bandan <address@hidden>
Return STORE_FULL if we can't write all the bytes but
return incomplete transfer if data received is less then
what was specified in the metadata. Also, use d->offset
as the file size which is valid for all file sizes.
Signed-off-by: Bandan <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-mtp.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 3fdc4b0da1..15edf3bb82 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -1665,13 +1665,14 @@ static void usb_mtp_write_data(MTPState *s)
goto success;
}
- rc = write_retry(d->fd, d->data, s->dataset.size);
- if (!rc) {
+ rc = write_retry(d->fd, d->data, d->offset);
+ if (rc != d->offset) {
usb_mtp_queue_result(s, RES_STORE_FULL, d->trans,
0, 0, 0, 0);
goto done;
}
- if (rc != s->dataset.size) {
+ /* Only for < 4G file sizes */
+ if (s->dataset.size != 0xFFFFFFFF && rc != s->dataset.size) {
usb_mtp_queue_result(s, RES_INCOMPLETE_TRANSFER, d->trans,
0, 0, 0, 0);
goto done;
--
2.9.3
- [Qemu-devel] [PULL 0/6] Usb 20180917 patches, Gerd Hoffmann, 2018/09/17
- [Qemu-devel] [PULL 1/6] usb-mtp: fix error conditions for write operation,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 5/6] usb: add config options for hub and hid devices (kbd, mouse, tablet)., Gerd Hoffmann, 2018/09/17
- [Qemu-devel] [PULL 3/6] usb-mtp: reset ObjectInfo dataset size on cleanup, Gerd Hoffmann, 2018/09/17
- [Qemu-devel] [PULL 6/6] usb: assign unique serial numbers to hid devices, Gerd Hoffmann, 2018/09/17
- [Qemu-devel] [PULL 4/6] usb-hub: clear suspend on detach, Gerd Hoffmann, 2018/09/17
- [Qemu-devel] [PULL 2/6] doc: replace x-root with rootdir for usb-mtp, Gerd Hoffmann, 2018/09/17
- Re: [Qemu-devel] [PULL 0/6] Usb 20180917 patches, Peter Maydell, 2018/09/25