From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E70D24107A6; Sat, 28 Feb 2026 17:44:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300692; cv=none; b=r4M+uPXp083VUX74REz3GqHPh8xo2wpybXZ9Bcchaoe96o/IpdskoWEe9tV8A64AuSd/kZvoNjktoP+S6Fg/f77bsCviKWx8Kdcm7QjkjYjjlDe+aCyC58YoiwHeHMANMzM4A8yIfiUmXura1TUH/EyPR9rmOtnWLU/3r2jRpbY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300692; c=relaxed/simple; bh=j60Mn7wCdsu2R+2+Hr/C3VqzHRBv4QO0Kx9Yg/Y9tPU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KCptSH5pHhCk7UqcqIWWzqiLunJMP7fV6cKcdQ6V+aO39xgcof57a87ed0UlXgMnLlHByilU+TP0rvEsj5tGYUM9g/Iez6HRbGHOP3i1tHFH3idZ43O1HdlDp1ymIY3FlQMIyJdDxC5FMjyDLqA9Q7b14KRvw/UrigS3TDicouE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KLT7KcM5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KLT7KcM5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC909C19423; Sat, 28 Feb 2026 17:44:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300691; bh=j60Mn7wCdsu2R+2+Hr/C3VqzHRBv4QO0Kx9Yg/Y9tPU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KLT7KcM5xHcumv/+42fSe5dY40I50rggW6TJ5RSp3cu2JXU6e1wvRe6t3SuB3hji7 ov4oc/cnWHt4a/WYrUEsw+0Sb7zwDypmi5TpQCa7Dvpb9j4ydfS6e26JGSvHV4oIRZ QSCUs/OoAnBWRGXTWj9zwFzsDgeq2/PPKlv3uOTkgntBZqcaKKh+pjCg9wyuzZfLKT V5NELDDlmgcPO46kSiwv0Ik8Yr02jDLbf4ZYPP6HPsY+jHF4OUghJE/v8toa7wEQ6Q i8wxkUkmUS28xm20ORNbGQd6+TfqdvBmttwHzAhDKbdy2J1lTnF+rD8Ymn0wcTBWs5 SJHi4puJkF3dw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Breno Leitao , "Peter Zijlstra (Intel)" , Oleg Nesterov , Andrii Nakryiko , "Masami Hiramatsu (Google)" , Sasha Levin Subject: [PATCH 6.19 727/844] uprobes: Fix incorrect lockdep condition in filter_chain() Date: Sat, 28 Feb 2026 12:30:40 -0500 Message-ID: <20260228173244.1509663-728-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Breno Leitao [ Upstream commit a56a38fd9196fc89401e498d70b7aa9c9679fa6e ] The list_for_each_entry_rcu() in filter_chain() uses rcu_read_lock_trace_held() as the lockdep condition, but the function holds consumer_rwsem, not the RCU trace lock. This gives me the following output when running with some locking debug option enabled: kernel/events/uprobes.c:1141 RCU-list traversed in non-reader section!! filter_chain register_for_each_vma uprobe_unregister_nosync __probe_event_disable Remove the incorrect lockdep condition since the rwsem provides sufficient protection for the list traversal. Fixes: cc01bd044e6a ("uprobes: travers uprobe's consumer list locklessly under SRCU protection") Signed-off-by: Breno Leitao Signed-off-by: Peter Zijlstra (Intel) Acked-by: Oleg Nesterov Acked-by: Andrii Nakryiko Acked-by: Masami Hiramatsu (Google) Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260128-uprobe_rcu-v2-1-994ea6d32730@debian.org Signed-off-by: Sasha Levin --- kernel/events/uprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 1ab7a7e4efb63..3ec996ca6de0d 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1138,7 +1138,7 @@ static bool filter_chain(struct uprobe *uprobe, struct mm_struct *mm) bool ret = false; down_read(&uprobe->consumer_rwsem); - list_for_each_entry_rcu(uc, &uprobe->consumers, cons_node, rcu_read_lock_trace_held()) { + list_for_each_entry(uc, &uprobe->consumers, cons_node) { ret = consumer_filter(uc, mm); if (ret) break; -- 2.51.0