From: Greg Kroah-Hartman Date: Tue, 21 Jul 2026 08:49:59 +0000 (+0200) Subject: 5.10-stable patches X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc57333378c91a76064e65af2d0cc3839e69b3fa;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: bnx2x-fix-potential-memory-leak-in-bnx2x_alloc_mem_bp.patch locking-rtmutex-skip-remove_waiter-when-waiter-is-not-enqueued.patch rtmutex-use-waiter-task-instead-of-current-in-remove_waiter.patch --- diff --git a/queue-5.10/bnx2x-fix-potential-memory-leak-in-bnx2x_alloc_mem_bp.patch b/queue-5.10/bnx2x-fix-potential-memory-leak-in-bnx2x_alloc_mem_bp.patch new file mode 100644 index 0000000000..97fc87b04f --- /dev/null +++ b/queue-5.10/bnx2x-fix-potential-memory-leak-in-bnx2x_alloc_mem_bp.patch @@ -0,0 +1,43 @@ +From a986fde914d88af47eb78fd29c5d1af7952c3500 Mon Sep 17 00:00:00 2001 +From: Abdun Nihaal +Date: Sat, 20 Jun 2026 11:53:50 +0530 +Subject: bnx2x: fix potential memory leak in bnx2x_alloc_mem_bp() + +From: Abdun Nihaal + +commit a986fde914d88af47eb78fd29c5d1af7952c3500 upstream. + +If the allocation of fp[i].tpa_info fails, the error path will not free +the struct bnx2x_fastpath allocated earlier, as it is not linked to the +bp structure yet. Fix that by linking it immediately after allocation. + +Cc: stable@vger.kernel.org +Fixes: 15192a8cf8a8 ("bnx2x: Split the FP structure") +Signed-off-by: Abdun Nihaal +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20260620062402.89549-1-nihaal@cse.iitm.ac.in +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c ++++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +@@ -4740,6 +4740,7 @@ int bnx2x_alloc_mem_bp(struct bnx2x *bp) + fp = kcalloc(bp->fp_array_size, sizeof(*fp), GFP_KERNEL); + if (!fp) + goto alloc_err; ++ bp->fp = fp; + for (i = 0; i < bp->fp_array_size; i++) { + fp[i].tpa_info = + kcalloc(ETH_MAX_AGGREGATION_QUEUES_E1H_E2, +@@ -4748,8 +4749,6 @@ int bnx2x_alloc_mem_bp(struct bnx2x *bp) + goto alloc_err; + } + +- bp->fp = fp; +- + /* allocate sp objs */ + bp->sp_objs = kcalloc(bp->fp_array_size, sizeof(struct bnx2x_sp_objs), + GFP_KERNEL); diff --git a/queue-5.10/locking-rtmutex-skip-remove_waiter-when-waiter-is-not-enqueued.patch b/queue-5.10/locking-rtmutex-skip-remove_waiter-when-waiter-is-not-enqueued.patch new file mode 100644 index 0000000000..bac0051912 --- /dev/null +++ b/queue-5.10/locking-rtmutex-skip-remove_waiter-when-waiter-is-not-enqueued.patch @@ -0,0 +1,64 @@ +From 40a25d59e85b3c8709ac2424d44f65610467871e Mon Sep 17 00:00:00 2001 +From: Davidlohr Bueso +Date: Thu, 7 May 2026 04:29:13 -0700 +Subject: locking/rtmutex: Skip remove_waiter() when waiter is not enqueued + +From: Davidlohr Bueso + +commit 40a25d59e85b3c8709ac2424d44f65610467871e upstream. + +syzbot triggered the following splat in remove_waiter() via +FUTEX_CMP_REQUEUE_PI: + + KASAN: null-ptr-deref in range [0x0000000000000a88-0x0000000000000a8f] + class_raw_spinlock_constructor + remove_waiter+0x159/0x1200 kernel/locking/rtmutex.c:1561 + rt_mutex_start_proxy_lock+0x103/0x120 + futex_requeue+0x10e4/0x20d0 + __x64_sys_futex+0x34f/0x4d0 + +task_blocks_on_rt_mutex() does not arm the waiter upon deadlock detection, +leaving waiter->task nil, where 3bfdc63936dd ("rtmutex: Use waiter::task instead +of current in remove_waiter()") made this fatal. + +Furthermore, rt_mutex_start_proxy_lock() should not be calling into remove_waiter() +upon a successfully grabbing the rtmutex. 1a1fb985f2e2 ("futex: Handle early deadlock +return correctly"), moved the remove_waiter() out of __rt_mutex_start_proxy_lock() +(where 'ret' was only ever 0 or < 0) into the wrapper. Tighten this check to +account for try_to_take_rt_mutex(). + +Fixes: 3bfdc63936dd ("rtmutex: Use waiter::task instead of current in remove_waiter()") +Reported-by: syzbot+78147abe6c524f183ee9@syzkaller.appspotmail.com +Signed-off-by: Davidlohr Bueso +Signed-off-by: Thomas Gleixner +Cc: stable@vger.kernel.org +Closes: https://lore.kernel.org/all/69f114ac.050a0220.ac8b.0003.GAE@google.com/ +Link: https://patch.msgid.link/20260507112913.1019537-1-dave@stgolabs.net +[Lee: Backported to linux-5.10.y from linux-6.1.y] +Signed-off-by: Lee Jones +Signed-off-by: Greg Kroah-Hartman +--- + kernel/locking/rtmutex.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/kernel/locking/rtmutex.c ++++ b/kernel/locking/rtmutex.c +@@ -1074,6 +1074,9 @@ static void remove_waiter(struct rt_mute + + lockdep_assert_held(&lock->wait_lock); + ++ if (!waiter_task) /* never enqueued */ ++ return; ++ + raw_spin_lock(&waiter_task->pi_lock); + rt_mutex_dequeue(lock, waiter); + waiter_task->pi_blocked_on = NULL; +@@ -1803,7 +1806,7 @@ int rt_mutex_start_proxy_lock(struct rt_ + + raw_spin_lock_irq(&lock->wait_lock); + ret = __rt_mutex_start_proxy_lock(lock, waiter, task); +- if (unlikely(ret)) ++ if (unlikely(ret < 0)) + remove_waiter(lock, waiter); + raw_spin_unlock_irq(&lock->wait_lock); + diff --git a/queue-5.10/rtmutex-use-waiter-task-instead-of-current-in-remove_waiter.patch b/queue-5.10/rtmutex-use-waiter-task-instead-of-current-in-remove_waiter.patch new file mode 100644 index 0000000000..2f7a702a74 --- /dev/null +++ b/queue-5.10/rtmutex-use-waiter-task-instead-of-current-in-remove_waiter.patch @@ -0,0 +1,85 @@ +From 3bfdc63936dd4773109b7b8c280c0f3b5ae7d349 Mon Sep 17 00:00:00 2001 +From: Keenan Dong +Date: Wed, 8 Apr 2026 16:46:00 +0800 +Subject: rtmutex: Use waiter::task instead of current in remove_waiter() + +From: Keenan Dong + +commit 3bfdc63936dd4773109b7b8c280c0f3b5ae7d349 upstream. + +remove_waiter() is used by the slowlock paths, but it is also used for +proxy-lock rollback in rt_mutex_start_proxy_lock() when invoked from +futex_requeue(). + +In the latter case waiter::task is not current, but remove_waiter() +operates on current for the dequeue operation. That results in several +problems: + + 1) the rbtree dequeue happens without waiter::task::pi_lock being held + + 2) the waiter task's pi_blocked_on state is not cleared, which leaves a + dangling pointer primed for UAF around. + + 3) rt_mutex_adjust_prio_chain() operates on the wrong top priority waiter + task + +Use waiter::task instead of current in all related operations in +remove_waiter() to cure those problems. + +[ tglx: Fixup rt_mutex_adjust_prio_chain(), add a comment and amend the + changelog ] + +Fixes: 8161239a8bcc ("rtmutex: Simplify PI algorithm and make highest prio task get lock") +Reported-by: Yuan Tan +Reported-by: Yifan Wu +Reported-by: Juefei Pu +Reported-by: Xin Liu +Signed-off-by: Keenan Dong +Signed-off-by: Thomas Gleixner +Cc: stable@vger.kernel.org +(cherry picked from commit d8cce4773c2b23d819baf5abedc62f7b430e8745) +[Lee: Backported to linux-5.10.y from linux-6.1.y] +Signed-off-by: Lee Jones +Signed-off-by: Greg Kroah-Hartman +--- + kernel/locking/rtmutex.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +--- a/kernel/locking/rtmutex.c ++++ b/kernel/locking/rtmutex.c +@@ -1061,20 +1061,23 @@ static void mark_wakeup_next_waiter(stru + * + * Must be called with lock->wait_lock held and interrupts disabled. I must + * have just failed to try_to_take_rt_mutex(). ++ * ++ * When invoked from rt_mutex_start_proxy_lock() waiter::task != current ! + */ + static void remove_waiter(struct rt_mutex *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 *next_lock; + + lockdep_assert_held(&lock->wait_lock); + +- raw_spin_lock(¤t->pi_lock); ++ raw_spin_lock(&waiter_task->pi_lock); + rt_mutex_dequeue(lock, waiter); +- current->pi_blocked_on = NULL; +- raw_spin_unlock(¤t->pi_lock); ++ waiter_task->pi_blocked_on = NULL; ++ raw_spin_unlock(&waiter_task->pi_lock); + + /* + * Only update priority if the waiter was the highest priority +@@ -1110,7 +1113,7 @@ static void remove_waiter(struct rt_mute + 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/queue-5.10/series b/queue-5.10/series index 4b2ba02661..ab76d4ae10 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -537,3 +537,6 @@ ieee802154-ca8210-fix-pointer-truncation-in-kfifo-on-64-bit.patch nvmet-tcp-check-init_failed-before-nvmet_req_uninit-.patch batman-adv-retrieve-ethhdr-after-potential-skb-reall.patch batman-adv-ensure-minimal-ethernet-header-on-tx.patch +rtmutex-use-waiter-task-instead-of-current-in-remove_waiter.patch +locking-rtmutex-skip-remove_waiter-when-waiter-is-not-enqueued.patch +bnx2x-fix-potential-memory-leak-in-bnx2x_alloc_mem_bp.patch