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=1794046331; b=b8pSKk+7rCmrH5lgPo08l9C2tCiti10SBBUTW7Qhs3ruw3eKpHpB0eH7tytkgTvogKiT z5zK7RRyeXo2eYIrayzBGtyS9iho6m8kA6xjyhH4s7GNZ8lUvqHqWQ5NEeP/eaZJOM95+ HDEl7ysgSKmUlE8WZwKTstDZc9mw7GFY5M6CW8W9CN3w//FACjg+zm/n4Hj29iARVLWeM Dyn7+K50k6Okhz4sz+etxPNmRpBTSzWHPgUCDZt1fvtyz7OAFwrgpRpC8uggdDq2jDDvI AGbow7r+VjYAbiKh4Ew0/Y+tUPh6xaGqysL+LOnuu9rH98I4gV/73L9Cpc6suoY5CeA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794046331; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=tNmdSfIbjB45Kf6Yy1dhD75zCbE7tslroozV9Sucevw=; b=OHEbY/nZFhmRBNftTOcOx2evYqnwPkcc/bP35sRTg1U8Lyhg01el0hBB4Yj4vjwPUmk5 uVkAXStsweTbbz/n1liw4SWMuQC8hQN6uRWAOGc6mFCviMv0xndm2kpjwL82ZAaXG/CAK tI0isBAEjnr5dq9hCDCT3iQFftDW0VRJTvybv08qE/FjtHvlYA2oltE4jeBoRCERBJXFA dzPZnh1BPy/WXK+UgqbKO69xgff/LTZ9C8oEO0Wmw5ZimczY7Ux73AmngP/Gdft2UBJGx rz0j+sgisdJVeUCw3RkZHA4Y3bQuzq1Ne4lLtCcSickPh1ITdYHK7gf4yeq4aBRyWMg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=bHyO1QkG; 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 8CFA9606A326 for ; Sat, 7 Nov 2026 10:12:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=bHyO1QkG Received: by smtp.kernel.org (Postfix) with ESMTPSA id E558D1F0089F; Sat, 7 Nov 2026 10:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794046331; bh=tNmdSfIbjB45Kf6Yy1dhD75zCbE7tslroozV9Sucevw=; h=From:To:Cc:Subject:Date; b=bHyO1QkG1b8N2H+/L9OdAHd1bRhVPUBClFi6ecWZH6155p8L2gINeRlpH3dxKj340 kIwlG11z7XK4O0rzTnSQ0oqmaAqUrQk7y1Gt9SVahB5W6afRgvu8mtCQlnra6rd+io sOPqw8rKozNaY0VIquJVTOWslRtSsW09iTPocFytwqswR9o8ZLduDScL6qW/EscWQO qjenQjYo4s58bSLwIqCgzznIPdfE6IPmpFZ3cZ1a8km4EWtZqCBSvRN+ZsM1PtURo9 ITv99tw+TzumBX3iMKrSfB57BPXtVkBJGyYYGL1ikmtA/EEbu2nYIBe5dRofciUMpV ZVM3yvn1dtAUA== From: Sasha Levin To: bsdhenrymartin@gmail.com, achender@kernel.org, kuba@kernel.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] rds: fix out-of-bounds conn_path walks via handshake exthdrs" failed to apply to 6.18-stable tree Date: Sat, 7 Nov 2026 05:12:09 -0500 Message-ID: <20261107051209-failed-6.18-50f2103fce43@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x 50f2103fce43922b6e562937b2d2fc62089ff7ec # git commit -s git send-email --to '' --in-reply-to '20261107051209-failed-6.18-50f2103fce43@kernel.org' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 50f2103fce43922b6e562937b2d2fc62089ff7ec Mon Sep 17 00:00:00 2001 From: Henry Martin Date: Mon, 12 Oct 2026 10:53:36 +0800 Subject: [PATCH] rds: fix out-of-bounds conn_path walks via handshake exthdrs Both the lane and the connection-generation negotiation are driven by extension headers in handshake packets, and both are processed unconditionally, even on transports that are not multipath capable. A non-MP connection (t_mp_capable unset) owns exactly one rds_conn_path slot, so a peer claiming up to RDS_MPATH_WORKERS lanes makes every subsequent fan-out walk conn->c_path[0..7] at 504-byte strides past the single allocated slot (KASAN: "Read of size 8 in rds_conn_path_connect_if_down"); the generation negotiation opens a similar out-of-bounds walk on the same array. Only process handshake extension headers when the connection's transport is multipath capable, so a peer can never make us walk lanes that do not exist. Both call sites in rds_recv_incoming() are gated. This is a port of the Oracle UEK fix for the same issue, picked up where Paula's series of the same change left off. This issue was discovered by Tencent CodeBuddy Security. Cc: stable@vger.kernel.org Link: https://lore.kernel.org/netdev/20260825120132.51636-1-pamoutafpro@gmail.com/ Link: https://github.com/oracle/linux-uek/commit/2fdeb0513f18 Fixes: 840df162b3eb ("rds: reduce memory footprint for RDS when transport is RDMA") Fixes: 905dd4184e07 ("RDS: TCP: Track peer's connection generation number") Signed-off-by: Henry Martin Reviewed-by: Allison Henderson Link: https://patch.msgid.link/20261012025336.54756-1-bsdhenrymartin@gmail.com Signed-off-by: Jakub Kicinski --- net/rds/recv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/rds/recv.c b/net/rds/recv.c index 6204e577a90ae..93ee4546ae362 100644 --- a/net/rds/recv.c +++ b/net/rds/recv.c @@ -379,7 +379,8 @@ void rds_recv_incoming(struct rds_connection *conn, struct in6_addr *saddr, rds_stats_inc(s_recv_ping); rds_send_pong(cp, inc->i_hdr.h_sport); /* if this is a handshake ping, start multipath if necessary */ - if (RDS_HS_PROBE(be16_to_cpu(inc->i_hdr.h_sport), + if (conn->c_trans->t_mp_capable && + RDS_HS_PROBE(be16_to_cpu(inc->i_hdr.h_sport), be16_to_cpu(inc->i_hdr.h_dport))) { rds_recv_hs_exthdrs(&inc->i_hdr, cp->cp_conn); rds_start_mprds(cp->cp_conn); @@ -387,7 +388,8 @@ void rds_recv_incoming(struct rds_connection *conn, struct in6_addr *saddr, goto out; } - if (be16_to_cpu(inc->i_hdr.h_dport) == RDS_FLAG_PROBE_PORT && + if (conn->c_trans->t_mp_capable && + be16_to_cpu(inc->i_hdr.h_dport) == RDS_FLAG_PROBE_PORT && inc->i_hdr.h_sport == 0) { rds_recv_hs_exthdrs(&inc->i_hdr, cp->cp_conn); /* if this is a handshake pong, start multipath if necessary */ -- 2.53.0