[Qemu-devel] [PATCH v2 0/2] usb: trivial fixes

[Qemu-devel] [PATCH v2 0/2] usb: trivial fixes

[Peter Xu]

Patch 1 fixes one unbounded stack warning case. Sending patch 2
again for convenience, please just drop it if we do not need it.

Thanks.

Peter Xu (2):
  usb: fix unbound stack usage for usb_mtp_add_str
  usb: trivial cleanup for usb_mtp_add_str

 hw/usb/dev-mtp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-- 
2.4.3

[Qemu-devel] [PATCH v2 1/2] usb: fix unbound stack usage for usb_mtp_add_str

[Peter Xu]

Use heap instead of stack.

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 hw/usb/dev-mtp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 7391783..62fb7cd 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -718,7 +718,7 @@ static void usb_mtp_add_wstr(MTPData *data, const wchar_t *str)
 static void usb_mtp_add_str(MTPData *data, const char *str)
 {
     uint32_t len = strlen(str)+1;
-    wchar_t wstr[len];
+    wchar_t *wstr = g_new(wchar_t, len);
     size_t ret;
 
     ret = mbstowcs(wstr, str, len);
@@ -727,6 +727,8 @@ static void usb_mtp_add_str(MTPData *data, const char *str)
     } else {
         usb_mtp_add_wstr(data, wstr);
     }
+
+    g_free(wstr);
 }
 
 static void usb_mtp_add_time(MTPData *data, time_t time)
-- 
2.4.3

Re: [Qemu-devel] [PATCH v2 1/2] usb: fix unbound stack usage for usb_mtp_add_str

[Gerd Hoffmann]

On Do, 2016-03-10 at 10:35 +0800, Peter Xu wrote:
> Use heap instead of stack.

Added to usb queue.

thanks,
  Gerd

[Qemu-devel] [PATCH v2 2/2] usb: trivial cleanup for usb_mtp_add_str

[Peter Xu]

Remove useless var "ret".

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 hw/usb/dev-mtp.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 62fb7cd..3c11148 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -719,10 +719,8 @@ static void usb_mtp_add_str(MTPData *data, const char *str)
 {
     uint32_t len = strlen(str)+1;
     wchar_t *wstr = g_new(wchar_t, len);
-    size_t ret;
 
-    ret = mbstowcs(wstr, str, len);
-    if (ret == -1) {
+    if (mbstowcs(wstr, str, len) == -1) {
         usb_mtp_add_wstr(data, L"Oops");
     } else {
         usb_mtp_add_wstr(data, wstr);
-- 
2.4.3