* [Qemu-devel] [PATCH v2 0/2] usb: trivial fixes
@ 2016-03-10 2:35 Peter Xu
2016-03-10 2:35 ` [Qemu-devel] [PATCH v2 1/2] usb: fix unbound stack usage for usb_mtp_add_str Peter Xu
2016-03-10 2:35 ` [Qemu-devel] [PATCH v2 2/2] usb: trivial cleanup " Peter Xu
0 siblings, 2 replies; 4+ messages in thread
From: Peter Xu @ 2016-03-10 2:35 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, famz, kraxel, peterx
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v2 1/2] usb: fix unbound stack usage for usb_mtp_add_str
2016-03-10 2:35 [Qemu-devel] [PATCH v2 0/2] usb: trivial fixes Peter Xu
@ 2016-03-10 2:35 ` Peter Xu
2016-03-18 12:55 ` Gerd Hoffmann
2016-03-10 2:35 ` [Qemu-devel] [PATCH v2 2/2] usb: trivial cleanup " Peter Xu
1 sibling, 1 reply; 4+ messages in thread
From: Peter Xu @ 2016-03-10 2:35 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, famz, kraxel, peterx
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v2 2/2] usb: trivial cleanup for usb_mtp_add_str
2016-03-10 2:35 [Qemu-devel] [PATCH v2 0/2] usb: trivial fixes Peter Xu
2016-03-10 2:35 ` [Qemu-devel] [PATCH v2 1/2] usb: fix unbound stack usage for usb_mtp_add_str Peter Xu
@ 2016-03-10 2:35 ` Peter Xu
1 sibling, 0 replies; 4+ messages in thread
From: Peter Xu @ 2016-03-10 2:35 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, famz, kraxel, peterx
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/2] usb: fix unbound stack usage for usb_mtp_add_str
2016-03-10 2:35 ` [Qemu-devel] [PATCH v2 1/2] usb: fix unbound stack usage for usb_mtp_add_str Peter Xu
@ 2016-03-18 12:55 ` Gerd Hoffmann
0 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2016-03-18 12:55 UTC (permalink / raw)
To: Peter Xu; +Cc: pbonzini, famz, qemu-devel
On Do, 2016-03-10 at 10:35 +0800, Peter Xu wrote:
> Use heap instead of stack.
Added to usb queue.
thanks,
Gerd
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-03-18 12:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-10 2:35 [Qemu-devel] [PATCH v2 0/2] usb: trivial fixes Peter Xu
2016-03-10 2:35 ` [Qemu-devel] [PATCH v2 1/2] usb: fix unbound stack usage for usb_mtp_add_str Peter Xu
2016-03-18 12:55 ` Gerd Hoffmann
2016-03-10 2:35 ` [Qemu-devel] [PATCH v2 2/2] usb: trivial cleanup " Peter Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.