From 4bb7ff2b913180b76e1ceb2340976f0fb7aabcd5 Mon Sep 17 00:00:00 2001 From: ykohut Date: Wed, 15 Oct 2025 04:31:13 +0000 Subject: [PATCH] Import of kernel-4.18.0-553.79.1.el8_10 --- Makefile.rhelver | 2 +- arch/x86/kvm/svm/svm.c | 2 -- net/bluetooth/l2cap_core.c | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index ed39208e3b..e8d32f6025 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 10 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 553.78.1 +RHEL_RELEASE = 553.79.1 # # ZSTREAM diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 33aa34a0bf..98f5634917 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3431,8 +3431,6 @@ static void svm_inject_irq(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm = to_svm(vcpu); - BUG_ON(!(gif_set(svm))); - trace_kvm_inj_virq(vcpu->arch.interrupt.nr); ++vcpu->stat.irq_injections; diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index d7d636f9eb..e5c4730277 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -6339,9 +6339,14 @@ static inline int l2cap_le_command_rej(struct l2cap_conn *conn, if (!chan) goto done; + chan = l2cap_chan_hold_unless_zero(chan); + if (!chan) + goto done; + l2cap_chan_lock(chan); l2cap_chan_del(chan, ECONNREFUSED); l2cap_chan_unlock(chan); + l2cap_chan_put(chan); done: mutex_unlock(&conn->chan_lock);