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 1C6BD3AE18D; Sat, 30 May 2026 17:08:41 +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=1780160923; cv=none; b=Fm7heC91XZrKY3dtq2lbhb7DzvEaA8cMfHxfT3PrqX8hDRVOuRCEiH8hWLpCSzOxW2FuURQEK9e3kS09wbTAOQZmL7hb0TbeYeIijDXtsm/vhsQhd62VKkBjx7AFHR/mtSDsxPC2mh7WkU4K97Xc011AB2O+kQi26POCdi9B/7Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160923; c=relaxed/simple; bh=WUIv9ILREpQzMOSEeudLik25D/IaNl6GONqc2zjXFbI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GH3Q+vl+lzmbSmivKS0aHmOr7ozJ21MOfG7WOCDMgdahPp4sfuePwvnmFaCSIzEOmSpnrk3V4F2KYCslm3YW0113VlmJ+Tve6KjJxzG+Jm+VMYtKFMEDegjkeYOkh/ojmDcXtwnoS++bDq1B50dgV5ON68XTt5gY3NAEVrFlTdE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jbRf/JDQ; 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="jbRf/JDQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BEAA1F00893; Sat, 30 May 2026 17:08:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780160921; bh=tjiRHgDxDACW2x8YXxnKqSZvzCaaRI76e9NiEprMo2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jbRf/JDQ26A+P0SQSaImMqXPKD58wW5rLe+oXPy0JRuIKTXOi3T1/b2ciI4KCPEV6 RYjqBbXZtohGG1xFCHItGFxjxtLJwa3mPR3d1OltzyqT//q0dIn6aGUIlexMv0FfCK 1Q369lAGvVlEERnb4o7dlsc6hWx0LCS1hvPSQMfk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Christoph=20B=C3=B6hmwalder?= , Christoph Hellwig , Andreas Gruenbacher , Bart Van Assche , Jens Axboe , Sasha Levin Subject: [PATCH 6.1 434/969] drbd: Balance RCU calls in drbd_adm_dump_devices() Date: Sat, 30 May 2026 17:59:18 +0200 Message-ID: <20260530160312.244856427@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bart Van Assche [ Upstream commit 2b31e86387e60b3689339f0f0fbb4d3623d9d494 ] Make drbd_adm_dump_devices() call rcu_read_lock() before rcu_read_unlock() is called. This has been detected by the Clang thread-safety analyzer. Tested-by: Christoph Böhmwalder Reviewed-by: Christoph Hellwig Cc: Andreas Gruenbacher Fixes: a55bbd375d18 ("drbd: Backport the "status" command") Signed-off-by: Bart Van Assche Link: https://patch.msgid.link/20260326214054.284593-1-bvanassche@acm.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/drbd/drbd_nl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 249eba7d21c28..5f6afcbb996c8 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -3345,8 +3345,10 @@ int drbd_adm_dump_devices(struct sk_buff *skb, struct netlink_callback *cb) if (resource_filter) { retcode = ERR_RES_NOT_KNOWN; resource = drbd_find_resource(nla_data(resource_filter)); - if (!resource) + if (!resource) { + rcu_read_lock(); goto put_result; + } cb->args[0] = (long)resource; } } @@ -3595,8 +3597,10 @@ int drbd_adm_dump_peer_devices(struct sk_buff *skb, struct netlink_callback *cb) if (resource_filter) { retcode = ERR_RES_NOT_KNOWN; resource = drbd_find_resource(nla_data(resource_filter)); - if (!resource) + if (!resource) { + rcu_read_lock(); goto put_result; + } } cb->args[0] = (long)resource; } -- 2.53.0