From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAS2q-0003nF-4A for qemu-devel@nongnu.org; Fri, 16 Aug 2013 17:59:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VAS2l-0008Pe-3Z for qemu-devel@nongnu.org; Fri, 16 Aug 2013 17:58:56 -0400 From: Alex Williamson Date: Fri, 16 Aug 2013 15:58:49 -0600 Message-ID: <20130816215706.23647.80992.stgit@bling.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v4] exec: Fix non-power-of-2 sized accesses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lersek@redhat.com, qemu-stable@nongnu.org, rth@twiddle.net Since commit 23326164 we align access sizes to match the alignment of the address, but we don't align the access size itself. This means we let illegal access sizes (ex. 3) slip through if the address is sufficiently aligned (ex. 4). This results in an abort which would be easy for a guest to trigger. Account for aligning the access size. Signed-off-by: Alex Williamson Cc: qemu-stable@nongnu.org --- v4: KISS v3: Highest power of 2, not lowest v2: Remove unnecessary loop condition exec.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/exec.c b/exec.c index 3ca9381..67a822c 100644 --- a/exec.c +++ b/exec.c @@ -1924,12 +1924,20 @@ static int memory_access_size(MemoryRegion *mr, unsigned l, hwaddr addr) } } - /* Don't attempt accesses larger than the maximum. */ - if (l > access_size_max) { - l = access_size_max; + /* Don't attempt accesses larger than the maximum or unsupported sizes. */ + if (l >= access_size_max) { + return access_size_max; + } else { + if (l >= 8) { + return 8; + } else if (l >= 4) { + return 4; + } else if (l >= 2) { + return 2; + } else { + return 1; + } } - - return l; } bool address_space_rw(AddressSpace *as, hwaddr addr, uint8_t *buf,