From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FA632D7DF1; Tue, 21 Jul 2026 22:56:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784674579; cv=none; b=QLBlZyi3/aavvb7IuEtVrfxXNHtKmGMiUWulTr8PZYnnS7MCHhejtRhu4G4vOdEmX52TLLM6YPOCT1W4rxdLMqSFITs/dWKH/cFZIfm5rf8qHiBEpdvv6b6gppQ4QDg9BSjFv2J8N6ECr25OokAcFuOKWT5cylFoidjHoVg/Nn8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784674579; c=relaxed/simple; bh=B8VlNiart2z09BAHrPKqN6tnQoUIGhXyzQM7kFcjNA4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JvR98waVYGQuqon5gyFPJSgzhbW2UzYpN9h7F9lUcy0p4H/yHwGVFQpb9EWQ9KekK3+J8YSqVwEeSdyDoYZfrSfzou0KrXZRbZhHqRanpbiZzg75+/C/19EyhcT/qzCxYLc1ERHAiqkoREHuZ9XgoPmcjYCxm9FzZdMnebzk9Zc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CX1FnGqA; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="CX1FnGqA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B35AA1F000E9; Tue, 21 Jul 2026 22:56:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784674578; bh=JZgBxpThfi6ZWLr2XSwB9E9mD4iH+p/BpSbubvcMFF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CX1FnGqA/8zw6JxFYWrzMNH3uSxvwAHPRLa7P2DHo4mXdDV3m0VQDAHfs1NM2Owpc gTVejGq1OWAIu0261ymF4kChAImQY0cEhdN2uGUh+P0oPmDPYibtnF6z7c+GrPFezz UhzM0WgQpa3Ws4wxi9b2F9DFHVbcIiJ0eRfYdFfo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+78147abe6c524f183ee9@syzkaller.appspotmail.com, Davidlohr Bueso , Thomas Gleixner , Lee Jones Subject: [PATCH 5.10 541/699] locking/rtmutex: Skip remove_waiter() when waiter is not enqueued Date: Tue, 21 Jul 2026 17:25:00 +0200 Message-ID: <20260721152407.906287751@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152355.667394603@linuxfoundation.org> References: <20260721152355.667394603@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ 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);