wcstombs(NULL, wstr, 0) returns (size_t)-1 when the string contains a
character that cannot be converted. The return value was not checked, so
dlen + 1 wrapped to 0, g_malloc(0) returned NULL, and
usb_mtp_write_metadata() dereferenced it in strchr().

Use size_t, return NULL on conversion failure, and reject the
filename in usb_mtp_write_metadata() when that happens.

Cc: [email protected]
Fixes: 6de02a13232a ("usb-mtp: fix utf16_to_str")
Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4529
Suggested-by: Hui Peng <https://gitlab.com/benquike>
Signed-off-by: Tommaso Califano <[email protected]>
---
 hw/usb/dev-mtp.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 1a26f681ce..7233470558 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -1563,7 +1563,8 @@ static void usb_mtp_cancel_packet(USBDevice *dev, 
USBPacket *p)
 static char *utf16_to_str(uint8_t len, uint8_t *str16)
 {
     wchar_t *wstr = g_new0(wchar_t, len + 1);
-    int count, dlen;
+    int count;
+    size_t dlen;
     char *dest;
 
     for (count = 0; count < len; count++) {
@@ -1572,9 +1573,13 @@ static char *utf16_to_str(uint8_t len, uint8_t *str16)
     }
     wstr[count] = 0;
 
-    dlen = wcstombs(NULL, wstr, 0) + 1;
-    dest = g_malloc(dlen);
-    wcstombs(dest, wstr, dlen);
+    dlen = wcstombs(NULL, wstr, 0);
+    if (dlen == (size_t)-1) {
+        g_free(wstr);
+        return NULL;
+    }
+    dest = g_malloc(dlen + 1);
+    wcstombs(dest, wstr, dlen + 1);
     g_free(wstr);
     return dest;
 }
@@ -1739,7 +1744,7 @@ static void usb_mtp_write_metadata(MTPState *s)
     filename = utf16_to_str(MIN(dataset->length, filename_chars),
                             dataset->filename);
 
-    if (strchr(filename, '/')) {
+    if (!filename || strchr(filename, '/')) {
         usb_mtp_queue_result(s, RES_PARAMETER_NOT_SUPPORTED, d->trans,
                              0, 0, 0, 0);
         g_free(filename);
-- 
2.56.0


Reply via email to