diff options
author | openeuler-ci-bot <george@openeuler.sh> | 2024-04-11 09:31:09 +0000 |
---|---|---|
committer | Gitee <noreply@gitee.com> | 2024-04-11 09:31:09 +0000 |
commit | fcf875ea5cf019d2291d00fc76249f198beb5b6d (patch) | |
tree | b8a3c2ef75c72500c43d840bbd4aabbd458fec26 | |
parent | 941a2f9e3ef9950bd055280a0eadffea73c9f12c (diff) | |
parent | a2db63f28fe506d7386aa48ed82f3a05d0b3e8cd (diff) | |
download | openEuler-kernel-fcf875ea5cf019d2291d00fc76249f198beb5b6d.tar.gz |
!5960 [sync] PR-5884: KVM: arm64: vgic-its: Fix CVE-2024-26598 fix patch issue
Merge Pull Request from: @openeuler-sync-bot
Origin pull request:
https://gitee.com/openeuler/kernel/pulls/5884
PR sync from: Jinjie Ruan <ruanjinjie@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OSEBM74ACF43YCV7LCPJPP4WPSTU2ZB3/
https://gitee.com/openeuler/kernel/issues/I9F351
Link:https://gitee.com/openeuler/kernel/pulls/5960
Reviewed-by: Zhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>
-rw-r--r-- | arch/arm64/kvm/vgic/vgic-its.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/vgic/vgic-its.c b/arch/arm64/kvm/vgic/vgic-its.c index 9c7bd5a8aa3527..1868cc0f0feec2 100644 --- a/arch/arm64/kvm/vgic/vgic-its.c +++ b/arch/arm64/kvm/vgic/vgic-its.c @@ -782,7 +782,6 @@ static int vgic_its_trigger_msi(struct kvm *kvm, struct vgic_its *its, raw_spin_lock_irqsave(&irq->irq_lock, flags); irq->pending_latch = true; vgic_queue_irq_unlock(kvm, irq, flags); - vgic_put_irq(kvm, irq); return 0; } @@ -801,6 +800,7 @@ int vgic_its_inject_cached_translation(struct kvm *kvm, struct kvm_msi *msi) raw_spin_lock_irqsave(&irq->irq_lock, flags); irq->pending_latch = true; vgic_queue_irq_unlock(kvm, irq, flags); + vgic_put_irq(kvm, irq); return 0; } |