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 03E881C5D77; Fri, 21 Nov 2025 13:52:54 +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=1763733175; cv=none; b=uKms8FCdFHbECFcOZ6UL6yOS1yttKLgpSX95Dou0WYj4WsZCI89w5Gf4IbJ5Jpb+b78UWeChQeZIrl8dEUTZefwb6mHW7qMYe8lAJaMCZcDnOp71NiN0kqGBmLIkhCevEWhHBByV2DRWEpEmQn7pgGafEWgxJBQQRF1apCBPKNA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763733175; c=relaxed/simple; bh=rqfZ8lVoOHbbZoPyTCp+VRrtVhwSWL+VbAC2IV3tQg8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b8Yx9lvcmCj2EpWAggh3CLqnZqvCcUVlF9S4uWMRUmTgn/tyIIlnN0oPTCXjQDh69lsPGxuB9usPCyNuSHh840M7Ik4v61wwmzQpipBaU1PmAPQFWUQYM8/R8qMR7TM2h5dcInIKQCwKjTvyBXWjP7OBoFMdSqL/R5K2gfh+AFg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PQFxbUoA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PQFxbUoA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77E6EC4CEF1; Fri, 21 Nov 2025 13:52:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1763733174; bh=rqfZ8lVoOHbbZoPyTCp+VRrtVhwSWL+VbAC2IV3tQg8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PQFxbUoA+oZ5um62spm/oxvCFGPvIxt61FeTCKHdtW9gMnwAsgdiH7lktj+nKMP62 TT8myTMRZ54WZVBOMXJI755rkYFCWbItGYMfcwIhRIth4g3vD/3Zy5Wl7WJoHm6xle pc90fBVnFw0WKSGqb6iCe+bRxgzYpXunAWMBteRw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xin Long , Stefan Wiehler , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 350/529] sctp: Hold sock lock while iterating over address list Date: Fri, 21 Nov 2025 14:10:49 +0100 Message-ID: <20251121130243.484613590@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251121130230.985163914@linuxfoundation.org> References: <20251121130230.985163914@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 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stefan Wiehler [ Upstream commit f1fc201148c7e684c10a72b6a3375597f28d1ef6 ] Move address list traversal in inet_assoc_attr_size() under the sock lock to avoid holding the RCU read lock. Suggested-by: Xin Long Fixes: 8f840e47f190 ("sctp: add the sctp_diag.c file") Signed-off-by: Stefan Wiehler Acked-by: Xin Long Link: https://patch.msgid.link/20251028161506.3294376-4-stefan.wiehler@nokia.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/sctp/diag.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/net/sctp/diag.c b/net/sctp/diag.c index 7799e5abdbd05..ad3e1462a896e 100644 --- a/net/sctp/diag.c +++ b/net/sctp/diag.c @@ -230,14 +230,15 @@ struct sctp_comm_param { bool net_admin; }; -static size_t inet_assoc_attr_size(struct sctp_association *asoc) +static size_t inet_assoc_attr_size(struct sock *sk, + struct sctp_association *asoc) { int addrlen = sizeof(struct sockaddr_storage); int addrcnt = 0; struct sctp_sockaddr_entry *laddr; list_for_each_entry_rcu(laddr, &asoc->base.bind_addr.address_list, - list) + list, lockdep_sock_is_held(sk)) addrcnt++; return nla_total_size(sizeof(struct sctp_info)) @@ -263,11 +264,14 @@ static int sctp_sock_dump_one(struct sctp_endpoint *ep, struct sctp_transport *t if (err) return err; - rep = nlmsg_new(inet_assoc_attr_size(assoc), GFP_KERNEL); - if (!rep) + lock_sock(sk); + + rep = nlmsg_new(inet_assoc_attr_size(sk, assoc), GFP_KERNEL); + if (!rep) { + release_sock(sk); return -ENOMEM; + } - lock_sock(sk); if (ep != assoc->ep) { err = -EAGAIN; goto out; -- 2.51.0