Patchwork [PULL,1/5] exec: fix writing to MMIO area with non-power-of-two length

login
register
mail settings
Submitter Paolo Bonzini
Date Sept. 5, 2013, 5:17 p.m.
Message ID <1378401455-583-2-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/272916/
State New
Headers show

Comments

Paolo Bonzini - Sept. 5, 2013, 5:17 p.m.
The problem is introduced by commit 2332616 (exec: Support 64-bit
operations in address_space_rw, 2013-07-08).  Before that commit,
memory_access_size would only return 1/2/4.

Since alignment is already handled above, reduce l to the largest
power of two that is smaller than l.

Cc: qemu-stable@nongnu.org
Reported-by: Oleksii Shevchuk <alxchk@gmail.com>
Tested-by: Oleksii Shevchuk <alxchk@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 exec.c | 3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/exec.c b/exec.c
index 87b0b39..b52ec80 100644
--- a/exec.c
+++ b/exec.c
@@ -1913,6 +1913,9 @@  static int memory_access_size(MemoryRegion *mr, unsigned l, hwaddr addr)
     if (l > access_size_max) {
         l = access_size_max;
     }
+    if (l & (l - 1)) {
+        l = 1 << (qemu_fls(l) - 1);
+    }
 
     return l;
 }