KVM: Fix stack-out-of-bounds read in write_mmio

[pandora-kernel.git] / include / trace / events / kvm.h

diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index 46e3cd8..215a904 100644 (file)
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -152,7 +152,7 @@ TRACE_EVENT(kvm_ack_irq,
        { KVM_TRACE_MMIO_WRITE, "write" }
 
 TRACE_EVENT(kvm_mmio,
        { KVM_TRACE_MMIO_WRITE, "write" }
 
 TRACE_EVENT(kvm_mmio,

-       TP_PROTO(int type, int len, u64 gpa, u64 val),
+       TP_PROTO(int type, int len, u64 gpa, void *val),

        TP_ARGS(type, len, gpa, val),
 
        TP_STRUCT__entry(
        TP_ARGS(type, len, gpa, val),
 
        TP_STRUCT__entry(


@@ -166,7 +166,10 @@ TRACE_EVENT(kvm_mmio,
                __entry->type           = type;
                __entry->len            = len;
                __entry->gpa            = gpa;
                __entry->type           = type;
                __entry->len            = len;
                __entry->gpa            = gpa;

-               __entry->val            = val;
+               __entry->val            = 0;
+               if (val)
+                       memcpy(&__entry->val, val,
+                              min_t(u32, sizeof(__entry->val), len));

        ),
 
        TP_printk("mmio %s len %u gpa 0x%llx val 0x%llx",
        ),
 
        TP_printk("mmio %s len %u gpa 0x%llx val 0x%llx",