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 B490D30BBB3; Mon, 13 Oct 2025 15:02:44 +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=1760367764; cv=none; b=ZkXics5iJjtpcydhlyLOoDk/62352ObqEYmhT4ic8S+8Yq+BrUXXLG8epjQe9PFbnSjvFXz4eZ0IA8/99a1mj/2zaXkFZN5TaQfgmuDJJw+vokMqI7EQPiOBpT5G9wHPqqLZfP87cKutNSwIuzN+m1XAsZ+BQq6mhSfDTrs099k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760367764; c=relaxed/simple; bh=TeK1Ulw8d3qa84O7VEdMSjOu6JxDHqj2Qesj5e1hLOY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ow3rQWcwpqn4lOpisziMDAB1L9x+L6LLdh+eMRLzt5lPYizf77ZKaD8oCPnoFSS1pVjt5A2JonKwCsgXWDn/Lxv2bWZ/UELSo6Yd7iks1E7WOXFl3nNTrN+J2NmYfnC76budKY1vC7WHTtv3CputqV5qyBDollSTg+3cjspXdUg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bfdlLBJs; 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="bfdlLBJs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41688C113D0; Mon, 13 Oct 2025 15:02:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760367764; bh=TeK1Ulw8d3qa84O7VEdMSjOu6JxDHqj2Qesj5e1hLOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bfdlLBJsyW+IkjmoyuiGDSxIi2sPjZK3EvA9KhVkS5sGgyfi/6HXdggP/RKkfJ0Pt TxIbb4eIWGT65HoJVpU7fkVDDhjcuTyJhiZyEaQqvQjFV9OOaNr6B8j/SbMkoqOmkf zjU6OgLQdUXsEAiXhRS6hGI4/k1+CQUb41dFyfHI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vlad Dumitrescu , Mark Zhang , Edward Srouji , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.6 125/196] IB/sa: Fix sa_local_svc_timeout_ms read race Date: Mon, 13 Oct 2025 16:45:16 +0200 Message-ID: <20251013144319.830914057@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013144315.184275491@linuxfoundation.org> References: <20251013144315.184275491@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: Vlad Dumitrescu [ Upstream commit 1428cd764cd708d53a072a2f208d87014bfe05bc ] When computing the delta, the sa_local_svc_timeout_ms is read without ib_nl_request_lock held. Though unlikely in practice, this can cause a race condition if multiple local service threads are managing the timeout. Fixes: 2ca546b92a02 ("IB/sa: Route SA pathrecord query through netlink") Signed-off-by: Vlad Dumitrescu Reviewed-by: Mark Zhang Signed-off-by: Edward Srouji Link: https://patch.msgid.link/20250916163112.98414-1-edwards@nvidia.com Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/core/sa_query.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c index 8175dde60b0a8..9902bb96c7409 100644 --- a/drivers/infiniband/core/sa_query.c +++ b/drivers/infiniband/core/sa_query.c @@ -1013,6 +1013,8 @@ int ib_nl_handle_set_timeout(struct sk_buff *skb, if (timeout > IB_SA_LOCAL_SVC_TIMEOUT_MAX) timeout = IB_SA_LOCAL_SVC_TIMEOUT_MAX; + spin_lock_irqsave(&ib_nl_request_lock, flags); + delta = timeout - sa_local_svc_timeout_ms; if (delta < 0) abs_delta = -delta; @@ -1020,7 +1022,6 @@ int ib_nl_handle_set_timeout(struct sk_buff *skb, abs_delta = delta; if (delta != 0) { - spin_lock_irqsave(&ib_nl_request_lock, flags); sa_local_svc_timeout_ms = timeout; list_for_each_entry(query, &ib_nl_request_list, list) { if (delta < 0 && abs_delta > query->timeout) @@ -1038,9 +1039,10 @@ int ib_nl_handle_set_timeout(struct sk_buff *skb, if (delay) mod_delayed_work(ib_nl_wq, &ib_nl_timed_work, (unsigned long)delay); - spin_unlock_irqrestore(&ib_nl_request_lock, flags); } + spin_unlock_irqrestore(&ib_nl_request_lock, flags); + settimeout_out: return 0; } -- 2.51.0