From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795024966; b=WMa6f0Cvlln22hkN3jNXsuk522BH3iJ+NIGrrVil9B0Ny0uLno0lpLxn1x6pJpvLYLD0 OrxgTN7bKUZWZ1p6O33BNj/yWuEqYtp6w2kvmJv4CHtP0nazMxup3VCAi70uqPP2OWwS+ SKELyIJ5FB91ZrwEdxgGfsI3LSdoB4V1Z4Xi9WUq7ek8VI90tl+z7n8lRIq8sg0dFjB8X XCZa0X0xN2xF+a7kpEG/DowXQiS8hGWSXccaEKFK8DamrxEHOT4W1R7t6xzIL78e6u7qD IiikLwIeX4U+ioRZ+ULh95TYp4tfTCxxsV53hXyEo5PmDPCPbH0cwAmfzwNv6s1NcHQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795024966; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Ot+5VaIsEGHo7DP8NRWeOFH/QIiL+EgW/+mUYP+7pWs=; b=CoG9F9BsNqGl3zCy6783XOJGngfXWea6wcNuWBb1qBVj1/hslQFj6wqOnIiDKbju2rgK PeMufQu1v+LT7fjPEPW+rHTU0D4EfeUNkYmttHY6U83s7/o1tkbP/D09euhZNBScSnJZ9 kvH7LKiX4yNXCfzD6GDJA/CRp7GNehwu0qVR4EJcGkd+5PLub4/q9Cban1/IZTwolqFMr y1nBG8kbaaTcaNisQzF6VebkoKhmKRIWssE0yNF7EVVa/zRZ5Ys3yS9d9mQ1hD2qzVRY1 fgUNreyqwCVI3S66vZBXsHZRvLkNcdxrCFeei590n0xrMgPqR/DKmntPgdS3ubJBJCg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=h9JcV72K; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65B7F606A336; Wed, 18 Nov 2026 18:02:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=h9JcV72K Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5BD31F000C4; Wed, 18 Nov 2026 18:02:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795024966; bh=Ot+5VaIsEGHo7DP8NRWeOFH/QIiL+EgW/+mUYP+7pWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h9JcV72KLHS/zH7yVUdxkeH7x0sltsKcXyT+Oiq9bwF1WiONg7YvSABkJ00rydNrP hZfDODUzdhQO4medkPHzbWl+TqzF2vJMkNPqQVbOvh2OToM2kGDfNCFl0OJ8ZHY3b6 ZYJItaa8BtV7jHauEzpF2DCdEO7zjFFqJhnIKhpM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dairui Zhang , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.18 0871/2151] IB/mad: fix UAF and double-free in RMPP receive reassembly Date: Wed, 18 Nov 2026 15:43:26 +0100 Message-ID: <20261118150153.930456279@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dairui Zhang [ Upstream commit 90e9b6357bec75f627cde1a85b5887215c80aad8 ] mad_rmpp_recv.state is protected by two locks that do not exclude each other: recv_timeout_handler() (port workqueue) uses agent->lock, continue_rmpp() (CQ softirq) uses rmpp_recv->lock. Nothing serializes the check-then-set sequence on the state word: T1 (CQ softirq) T2 (port workqueue) continue_rmpp() lock(rmpp_recv->lock) state == ACTIVE [passes] recv_timeout_handler() lock(agent->lock) state = TIMEOUT list_del(&rmpp_recv->list) unlock(agent->lock) destroy_rmpp_recv() wait_for_completion() [blocks on T1's ref] state = COMPLETE unlock(rmpp_recv->lock) complete_rmpp() queue cleanup_work (+10s) deref() [unblocks] kfree(rmpp_recv) ib_free_recv_mad(done_wc) +10s: recv_cleanup_handler() runs lock/list_del/destroy on the freed rmpp_recv -> UAF write and double free; nothing can cancel that cleanup_work anymore, the entry is already off agent->rmpp_list. done_wc is also returned to ib_mad_complete_recv() and freed again -> UAF read and double free. Reaching this requires sending MADs to a kernel RMPP agent from the InfiniBand/RoCE fabric: the per-port sa_query agent accepts subnet manager responses whose SLID/GID/TID are not authenticated on the fabric, and legacy user_mad agents registered without IB_USER_MAD_USER_RMPP start reassembly on any incoming RMPP DATA MAD with an attacker-chosen TID, no in-flight send required. The attacker controls segment timing and can run many transactions in parallel (agent->rmpp_list has no cap), so landing the microseconds-wide receive critical section on the 40-second timeout boundary is a matter of patience, not luck. Unify state transitions under rmpp_recv->lock in recv_timeout_handler(), keeping list manipulation under agent->lock (which preserves the agent->lock -> rmpp_recv->lock ordering used by continue_rmpp()). State check/set in both paths is then serialized, so the loser of the race always observes the final state and bails out. recv_cleanup_handler() needs no change: with transitions serialized, a cleanup_work can only be pending after COMPLETE, in which case the timeout handler exits early. The race is as old as the RMPP implementation itself. Fixes: fa619a77046b ("[PATCH] IB: Add RMPP implementation") Assisted-by: LLM Signed-off-by: Dairui Zhang Link: https://patch.msgid.link/20260922152342.1474845-1-zhangdairui@gmail.com Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/core/mad_rmpp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c index 1c5e0eaf1c942..28d51b4844856 100644 --- a/drivers/infiniband/core/mad_rmpp.c +++ b/drivers/infiniband/core/mad_rmpp.c @@ -245,12 +245,15 @@ static void recv_timeout_handler(struct work_struct *work) struct ib_mad_recv_wc *rmpp_wc; unsigned long flags; - spin_lock_irqsave(&rmpp_recv->agent->lock, flags); + spin_lock_irqsave(&rmpp_recv->lock, flags); if (rmpp_recv->state != RMPP_STATE_ACTIVE) { - spin_unlock_irqrestore(&rmpp_recv->agent->lock, flags); + spin_unlock_irqrestore(&rmpp_recv->lock, flags); return; } rmpp_recv->state = RMPP_STATE_TIMEOUT; + spin_unlock_irqrestore(&rmpp_recv->lock, flags); + + spin_lock_irqsave(&rmpp_recv->agent->lock, flags); list_del(&rmpp_recv->list); spin_unlock_irqrestore(&rmpp_recv->agent->lock, flags); -- 2.53.0