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 7B2A47CF33; Wed, 21 Feb 2024 13:33:22 +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=1708522402; cv=none; b=n0jtFaWwb7KWCgDzEjoRA4/qfzV1+4X35oStAQwNZ+ZoqURVm1sOQtC+XgRCw9gWYdZhjpiUgG60COfXLsy4XZsp0cw/Y0wR5scfFVJFLWNPx+W8wWkqHuW73MMrOcgUc1an0U4ZguoTFmW5iwR26K1wPRYgMiLelM+ppuv893Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708522402; c=relaxed/simple; bh=KQea/yjr9I6jvnI+rRlHFlY1Yc0xlHO1RqFPe5+8XUs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e8bmeTZ6JlYRAX8uhbia0Kc17wmIAw/9DaJIuRzwcxpetX8ubTcuhj5w6IHM/hm6X/5GXSAldWPjLraVHKHlh83h7cw1GV6jH/BjjJmKjkl+NkYV/IYHqON8bQu8jkRwUmW/Hv6QcZWP/U6AO/xADSIubsLM/JuFg7an2csLPEQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=i6d3HgJP; 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="i6d3HgJP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5811C43390; Wed, 21 Feb 2024 13:33:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708522402; bh=KQea/yjr9I6jvnI+rRlHFlY1Yc0xlHO1RqFPe5+8XUs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i6d3HgJPr4xq8z0+Md6WzIPajev0jVPscVK/dUbjJsjTO9v+r+1gSkCdbTwKJomNW XFn1RsnU1IBBteZFQGBjVasWq+H7Qm1Y+4ZEMQ5pBLeUFDhuqp90P9pbYzfLZbTIfU GZC2dBKmphXItQcJMe62PTydatLLco+J6icIHmRk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Oleg Nesterov , David Howells , Marc Dionne , linux-afs@lists.infradead.org, Sasha Levin Subject: [PATCH 5.15 154/476] rxrpc_find_service_conn_rcu: fix the usage of read_seqbegin_or_lock() Date: Wed, 21 Feb 2024 14:03:25 +0100 Message-ID: <20240221130013.623868375@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240221130007.738356493@linuxfoundation.org> References: <20240221130007.738356493@linuxfoundation.org> User-Agent: quilt/0.67 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.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oleg Nesterov [ Upstream commit bad1a11c0f061aa073bab785389fe04f19ba02e1 ] rxrpc_find_service_conn_rcu() should make the "seq" counter odd on the second pass, otherwise read_seqbegin_or_lock() never takes the lock. Signed-off-by: Oleg Nesterov Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org Link: https://lore.kernel.org/r/20231117164846.GA10410@redhat.com/ Signed-off-by: Sasha Levin --- net/rxrpc/conn_service.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/rxrpc/conn_service.c b/net/rxrpc/conn_service.c index 6e6aa02c6f9e..249353417a18 100644 --- a/net/rxrpc/conn_service.c +++ b/net/rxrpc/conn_service.c @@ -31,7 +31,7 @@ struct rxrpc_connection *rxrpc_find_service_conn_rcu(struct rxrpc_peer *peer, struct rxrpc_conn_proto k; struct rxrpc_skb_priv *sp = rxrpc_skb(skb); struct rb_node *p; - unsigned int seq = 0; + unsigned int seq = 1; k.epoch = sp->hdr.epoch; k.cid = sp->hdr.cid & RXRPC_CIDMASK; @@ -41,6 +41,7 @@ struct rxrpc_connection *rxrpc_find_service_conn_rcu(struct rxrpc_peer *peer, * under just the RCU read lock, so we have to check for * changes. */ + seq++; /* 2 on the 1st/lockless path, otherwise odd */ read_seqbegin_or_lock(&peer->service_conn_lock, &seq); p = rcu_dereference_raw(peer->service_conns.rb_node); -- 2.43.0