KVM: x86: Fully initialize 'struct kvm_lapic_irq' in kvm_pv_kick_cpu_op()
Subsystems (5)
PATCH v2 1/1 KVM: x86: Fully initialize 'struct kvm_lapic_irq' in kvm_pv_kick_cpu_op()
'vector' and 'trig_mode' fields of 'struct kvm_lapic_irq' are left uninitialized in kvm_pv_kick_cpu_op(). While these fields are normally not needed for APIC_DM_REMRD, they're still referenced by __apic_accept_irq() for trace_kvm_apic_accept_irq(). Fully initialize the structure to avoid consuming random stack memory.
---
- Changes since v1:
Only set fields which matter for APIC_DM_REMRD and defer initialization of the rest to the compiler [Sean].
--- arch/x86/kvm/x86.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
arch/x86/kvm/x86.c +10 -8
@@ -9340,15 +9340,17 @@ static int kvm_pv_clock_pairing(struct kvm_vcpu *vcpu, gpa_t paddr,*/ static void kvm_pv_kick_cpu_op (struct kvm *kvm,int apicid) { -struct kvm_lapic_irq lapic_irq; - - lapic_irq.shorthand =APIC_DEST_NOSHORT ; - lapic_irq.dest_mode =APIC_DEST_PHYSICAL ; - lapic_irq.level =0 ; - lapic_irq.dest_id = apicid; - lapic_irq.msi_redir_hint = false; +/* +* All other fields are unused for APIC_DM_REMRD, but may be consumed by +* common code, e.g. for tracing. Defer initialization to the compiler. +*/ +struct kvm_lapic_irq lapic_irq = { + .delivery_mode =APIC_DM_REMRD , + .dest_mode =APIC_DEST_PHYSICAL , + .shorthand =APIC_DEST_NOSHORT , + .dest_id = apicid, + }; - lapic_irq.delivery_mode =APIC_DM_REMRD ;kvm_irq_delivery_to_apic (kvm,NULL , &lapic_irq,NULL ); }
Signature · 1 line
2.35.3
Quoted 9 lines · Vitaly Kuznetsov
'vector' and '
trig_mode' fields of 'structkvm_lapic_irq' are left uninitialized inkvm_pv_kick_cpu_op(). While these fields are normally not needed forAPIC_DM_REMRD, they're still referenced by__apic_accept_irq()fortrace_kvm_apic_accept_irq(). Fully initialize the structure to avoid consuming random stack memory.Fixes a183b638b61c ("KVM: x86: make apic_accept_irq tracepoint more generic")Reported-by [email protected]Signed-off-by Vitaly Kuznetsov <[email protected]>
The patch was sent to linux-hyperv@ by mistake, my apologies.
Signature · 1 line
Vitaly
Quoted 10 lines · Vitaly Kuznetsov
'vector' and '
trig_mode' fields of 'structkvm_lapic_irq' are left uninitialized inkvm_pv_kick_cpu_op(). While these fields are normally not needed forAPIC_DM_REMRD, they're still referenced by__apic_accept_irq()fortrace_kvm_apic_accept_irq(). Fully initialize the structure to avoid consuming random stack memory.Fixes a183b638b61c ("KVM: x86: make apic_accept_irq tracepoint more generic")Reported-by [email protected]Signed-off-by Vitaly Kuznetsov <[email protected]>---
Queued, thanks.
Paolo