qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Peter Xu <peterx@redhat.com>
Subject: [Qemu-devel] [PULL 2/6] usb: fix unbounded stack warning for xhci_dma_write_u32s
Date: Mon, 21 Mar 2016 12:10:20 +0100	[thread overview]
Message-ID: <1458558624-6890-3-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1458558624-6890-1-git-send-email-kraxel@redhat.com>

From: Peter Xu <peterx@redhat.com>

All the callers for xhci_dma_write_u32s() are using mostly 5 * uint32_t
in len. To avoid unbound stack warning for the function, make it
statically allocated, and assert when it's not big enough in the
future.

Signed-off-by: Peter Xu <peterx@redhat.com>
Message-id: 1457661106-9569-1-git-send-email-peterx@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb/hcd-xhci.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 44b6f8c..bcde8a2 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -698,11 +698,13 @@ static inline void xhci_dma_write_u32s(XHCIState *xhci, dma_addr_t addr,
                                        uint32_t *buf, size_t len)
 {
     int i;
-    uint32_t tmp[len / sizeof(uint32_t)];
+    uint32_t tmp[5];
+    uint32_t n = len / sizeof(uint32_t);
 
     assert((len % sizeof(uint32_t)) == 0);
+    assert(n <= ARRAY_SIZE(tmp));
 
-    for (i = 0; i < (len / sizeof(uint32_t)); i++) {
+    for (i = 0; i < n; i++) {
         tmp[i] = cpu_to_le32(buf[i]);
     }
     pci_dma_write(PCI_DEVICE(xhci), addr, tmp, len);
-- 
1.8.3.1

  parent reply	other threads:[~2016-03-21 11:10 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-21 11:10 [Qemu-devel] [PULL 0/6] usb patch queue Gerd Hoffmann
2016-03-21 11:10 ` [Qemu-devel] [PULL 1/6] usb: Fix compilation for Windows Gerd Hoffmann
2016-03-21 11:10 ` Gerd Hoffmann [this message]
2016-03-21 11:10 ` [Qemu-devel] [PULL 3/6] usb: fix unbound stack usage for usb_mtp_add_str Gerd Hoffmann
2016-03-21 11:10 ` [Qemu-devel] [PULL 4/6] usb: fix unbound stack warning for inotify_watchfn Gerd Hoffmann
2016-03-21 11:10 ` [Qemu-devel] [PULL 5/6] hw/usb/dev-mtp: Guard inotify usage with CONFIG_INOTIFY1 Gerd Hoffmann
2016-03-21 11:10 ` [Qemu-devel] [PULL 6/6] usb: ehci: add capability mmio write function Gerd Hoffmann
2016-03-22 17:39 ` [Qemu-devel] [PULL 0/6] usb patch queue Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458558624-6890-3-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).