Commit 63159601 authored by Peter Maydell's avatar Peter Maydell
Browse files

target/arm: Stop using variable length array in dc_zva 



Currently the dc_zva helper function uses a variable length
array. In fact we know (as the comment above remarks) that
the length of this array is bounded because the architecture
limits the block size and QEMU limits the target page size.
Use a fixed array size and assert that we don't run off it.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190503120448.13385-1-peter.maydell@linaro.org
parent f1e2598c

target/arm/helper.c

+6 −2
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "qemu/units.h"

#include "target/arm/idau.h"

#include "trace.h"

#include "cpu.h"
@@ -13130,14 +13131,17 @@ void HELPER(dc_zva)(CPUARMState *env, uint64_t vaddr_in) 
         * We know that in fact for any v8 CPU the page size is at least 4K

         * and the block size must be 2K or less, but TARGET_PAGE_SIZE is only

         * 1K as an artefact of legacy v5 subpage support being present in the

         * same QEMU executable.

         * same QEMU executable. So in practice the hostaddr[] array has

         * two entries, given the current setting of TARGET_PAGE_BITS_MIN.

         */

        int maxidx = DIV_ROUND_UP(blocklen, TARGET_PAGE_SIZE);

        void *hostaddr[maxidx];

        void *hostaddr[DIV_ROUND_UP(2 * KiB, 1 << TARGET_PAGE_BITS_MIN)];

        int try, i;

        unsigned mmu_idx = cpu_mmu_index(env, false);

        TCGMemOpIdx oi = make_memop_idx(MO_UB, mmu_idx);



        assert(maxidx <= ARRAY_SIZE(hostaddr));



        for (try = 0; try < 2; try++) {



            for (i = 0; i < maxidx; i++) {