From 723965590d218d20ec2a3666325c342d0823a50e Mon Sep 17 00:00:00 2001 From: almalinux-bot-kernel Date: Sat, 11 Jul 2026 05:07:54 +0000 Subject: [PATCH] Import of kernel-5.14.0-687.24.1.el9_8 --- ...0-687.23.1.el9 => COPYING-5.14.0-687.24.1.el9 | 0 kernel.sbat | 4 ++-- kernel/locking/rtmutex.c | 16 +++++++++++----- kernel/locking/rtmutex_api.c | 2 +- net/sched/sch_ets.c | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) rename COPYING-5.14.0-687.23.1.el9 => COPYING-5.14.0-687.24.1.el9 (100%) diff --git a/COPYING-5.14.0-687.23.1.el9 b/COPYING-5.14.0-687.24.1.el9 similarity index 100% rename from COPYING-5.14.0-687.23.1.el9 rename to COPYING-5.14.0-687.24.1.el9 diff --git a/kernel.sbat b/kernel.sbat index 0c06aafb01..4f76785cc9 100644 --- a/kernel.sbat +++ b/kernel.sbat @@ -1,3 +1,3 @@ sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md -kernel.rhel,1,Red Hat,kernel-core,5.14.0-687.23.1.el9.x86_64,mailto:secalert@redhat.com -kernel.almalinux,1,AlmaLinux,kernel-core,5.14.0-687.23.1.el9.x86_64,mailto:security@almalinux.org +kernel.rhel,1,Red Hat,kernel-core,5.14.0-687.24.1.el9.x86_64,mailto:secalert@redhat.com +kernel.almalinux,1,AlmaLinux,kernel-core,5.14.0-687.24.1.el9.x86_64,mailto:security@almalinux.org diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 1eb4f94990..1cecc10925 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -1534,20 +1534,26 @@ static bool rtmutex_spin_on_owner(struct rt_mutex_base *lock, * * Must be called with lock->wait_lock held and interrupts disabled. It must * have just failed to try_to_take_rt_mutex(). + * + * When invoked from rt_mutex_start_proxy_lock() waiter::task != current ! */ static void __sched remove_waiter(struct rt_mutex_base *lock, struct rt_mutex_waiter *waiter) { bool is_top_waiter = (waiter == rt_mutex_top_waiter(lock)); struct task_struct *owner = rt_mutex_owner(lock); + struct task_struct *waiter_task = waiter->task; struct rt_mutex_base *next_lock; lockdep_assert_held(&lock->wait_lock); - raw_spin_lock(¤t->pi_lock); - rt_mutex_dequeue(lock, waiter); - current->pi_blocked_on = NULL; - raw_spin_unlock(¤t->pi_lock); + if (!waiter_task) /* never enqueued */ + return; + + scoped_guard(raw_spinlock, &waiter_task->pi_lock) { + rt_mutex_dequeue(lock, waiter); + waiter_task->pi_blocked_on = NULL; + } /* * Only update priority if the waiter was the highest priority @@ -1583,7 +1589,7 @@ static void __sched remove_waiter(struct rt_mutex_base *lock, raw_spin_unlock_irq(&lock->wait_lock); rt_mutex_adjust_prio_chain(owner, RT_MUTEX_MIN_CHAINWALK, lock, - next_lock, NULL, current); + next_lock, NULL, waiter_task); raw_spin_lock_irq(&lock->wait_lock); } diff --git a/kernel/locking/rtmutex_api.c b/kernel/locking/rtmutex_api.c index 6614ccdc11..341a540f62 100644 --- a/kernel/locking/rtmutex_api.c +++ b/kernel/locking/rtmutex_api.c @@ -347,7 +347,7 @@ int __sched rt_mutex_start_proxy_lock(struct rt_mutex_base *lock, raw_spin_lock_irq(&lock->wait_lock); ret = __rt_mutex_start_proxy_lock(lock, waiter, task, &wake_q); - if (unlikely(ret)) + if (unlikely(ret < 0)) remove_waiter(lock, waiter); preempt_disable(); raw_spin_unlock_irq(&lock->wait_lock); diff --git a/net/sched/sch_ets.c b/net/sched/sch_ets.c index 82635dd2cf..ae46643e59 100644 --- a/net/sched/sch_ets.c +++ b/net/sched/sch_ets.c @@ -652,7 +652,7 @@ static int ets_qdisc_change(struct Qdisc *sch, struct nlattr *opt, sch_tree_lock(sch); for (i = nbands; i < oldbands; i++) { - if (i >= q->nstrict && q->classes[i].qdisc->q.qlen) + if (cl_is_active(&q->classes[i])) list_del_init(&q->classes[i].alist); qdisc_purge_queue(q->classes[i].qdisc); }