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

exec.c: Use correct attrs in cpu_memory_rw_debug() 

In the softmmu version of cpu_memory_rw_debug(), we ask the
CPU for the attributes to use for the virtual memory access,
and we correctly use those to identify the address space
index. However, we were not passing them in to the
address_space_write_rom() and address_space_rw() functions.

The effect of this was that a memory access from the gdbstub
to a device which had behaviour that was sensitive to the
memory attributes (such as some ARMv8M NVIC registers) was
incorrectly always performed as if non-secure, rather than
using the right security state for the CPU's current state.

Fixes: https://bugs.launchpad.net/qemu/+bug/1812091



Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190117133834.7480-1-peter.maydell@linaro.org
parent b36356f6

exec.c

+2 −4
Original line number Diff line number Diff line
@@ -3882,12 +3882,10 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, 
        phys_addr += (addr & ~TARGET_PAGE_MASK);

        if (is_write) {

            address_space_write_rom(cpu->cpu_ases[asidx].as, phys_addr,

                                    MEMTXATTRS_UNSPECIFIED,

                                    buf, l);

                                    attrs, buf, l);

        } else {

            address_space_rw(cpu->cpu_ases[asidx].as, phys_addr,

                             MEMTXATTRS_UNSPECIFIED,

                             buf, l, 0);

                             attrs, buf, l, 0);

        }

        len -= l;

        buf += l;