diff mbox

exec: remove unused compacted argument

Message ID 20160928123720.21171-1-marcandre.lureau@redhat.com
State New
Headers show

Commit Message

Marc-André Lureau Sept. 28, 2016, 12:37 p.m. UTC 
Since commit b35ba30f8f when it was introduced, phys_page_compact()
takes an unused compacted argument.

ubsan complains about it when launching qemu-x86_64 without arguments:
qemu/exec.c:310:5: runtime error: variable length array bound evaluates to non-positive value 0

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 exec.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Michael Tokarev Sept. 29, 2016, 3:55 p.m. UTC | #1 
28.09.2016 15:37, Marc-André Lureau wrote:
> Since commit b35ba30f8f when it was introduced, phys_page_compact()
> takes an unused compacted argument.
>
> ubsan complains about it when launching qemu-x86_64 without arguments:
> qemu/exec.c:310:5: runtime error: variable length array bound evaluates to non-positive value 0

Applied to -trivial, thanks!

/mjt
diff mbox

Patch

diff --git a/exec.c b/exec.c
index c81d5ab..fc7e902 100644
--- a/exec.c
+++ b/exec.c
@@ -255,7 +255,7 @@  static void phys_page_set(AddressSpaceDispatch *d,
 /* Compact a non leaf page entry. Simply detect that the entry has a single child,
  * and update our entry so we can skip it and go directly to the destination.
  */
-static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *compacted)
+static void phys_page_compact(PhysPageEntry *lp, Node *nodes)
 {
     unsigned valid_ptr = P_L2_SIZE;
     int valid = 0;
@@ -275,7 +275,7 @@  static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *com
         valid_ptr = i;
         valid++;
         if (p[i].skip) {
-            phys_page_compact(&p[i], nodes, compacted);
+            phys_page_compact(&p[i], nodes);
         }
     }
 
@@ -307,10 +307,8 @@  static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *com
 
 static void phys_page_compact_all(AddressSpaceDispatch *d, int nodes_nb)
 {
-    DECLARE_BITMAP(compacted, nodes_nb);
-
     if (d->phys_map.skip) {
-        phys_page_compact(&d->phys_map, d->map.nodes, compacted);
+        phys_page_compact(&d->phys_map, d->map.nodes);
     }
 }