lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 049/230] arm/arm64: KVM: Feed initialized memory to MMIO accesses
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Marc Zyngier <marc.zyngier@arm.com>

    commit 1d6a821277aaa0cdd666278aaff93298df313d41 upstream.

    On an MMIO access, we always copy the on-stack buffer info
    the shared "run" structure, even if this is a read access.
    This ends up leaking up to 8 bytes of uninitialized memory
    into userspace, depending on the size of the access.

    An obvious fix for this one is to only perform the copy if
    this is an actual write.

    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/kvm/mmio.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/arch/arm/kvm/mmio.c
    +++ b/arch/arm/kvm/mmio.c
    @@ -207,7 +207,8 @@ int io_mem_abort(struct kvm_vcpu *vcpu,
    run->mmio.is_write = is_write;
    run->mmio.phys_addr = fault_ipa;
    run->mmio.len = len;
    - memcpy(run->mmio.data, data_buf, len);
    + if (is_write)
    + memcpy(run->mmio.data, data_buf, len);

    if (!ret) {
    /* We handled the access successfully in the kernel. */

    \
     
     \ /
      Last update: 2019-03-22 14:14    [W:4.151 / U:0.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site