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=1794047758; b=Rl7+oR33wFtNUaCvBU6XQrI5QvnHlUbymyfH8CxxdcUWe27vQd/G6F4MCM4n+MKNtlux 6r63eCdW5+PAE+NlFQzRP4XDak6A9wvHnTaKMerd3IA9Vi2Vz6ojUKqHm/fXlorf5eZAD u0BxOFqIo7jbGB42oS5kN+kycSUsT5Ql7CI/+nOzdCVNlgryJL9fS5Lqkqx+J1EeLIiUh 7aMCZW3OwxWAAhl2W9zdabeQY+M5GMWj4nTayLT1Ss0frJSCNmpqHQCp+Ybu9ltTPGQpq o9YF2U9yh/UGsS6MMzTbD0ZONi4c1NR/qwCOPCQqhtezHdF+Joz+VReTLBDV36SOxFw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794047758; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=ELNWdQqHAPe52ZU/XT/+rY0gYc1DMC1NlC0YzYuB8+8=; b=yfpCQB9MWTkST1n4YdqJot/5FIuhGk6Xl3FYNME6BhpSR52KhbCB0I+1yio58NUulk81 nfKR74srzIO2DV1QWkjIugWlljBTYpbho+REfnROEy5Pe4lZcJLgpVgasCbjA3Z6RWQC9 Xpax3p4vG3NTR/GJyC2h/4dJtnPvnNFe0rHy3yi/bncM4wz+jliR9GijLKqzrrikyq3AE VWnXeXv1extOHplrqeUhGndj6CCPyRga4A3XEiL+W0+d6oGhZrgZKw+waiKbvvuuPHwTI FTYj93Z6HiW5sNL9z6Cj5xEu/Lx0Q3kUgY8MGMOO0MyFWULGQmCGgusgASY0FoiCTwQ== 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=Q+9JDkos; 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 E7EFC606A330 for ; Sat, 7 Nov 2026 10:35:57 +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=Q+9JDkos Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EAFC1F0089F; Sat, 7 Nov 2026 10:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794047757; bh=ELNWdQqHAPe52ZU/XT/+rY0gYc1DMC1NlC0YzYuB8+8=; h=From:To:Cc:Subject:Date; b=Q+9JDkosQRkexw6P/nzHAAuCzejvjKn214uBaz9G9GtnHIMH7YOgRDAavv01mqa4s YLaMlOBNF6xObKOVWKgy/7Yn7ImnBHyZ8uS9lYY39URaMm0EhjZWbJLq8NzlotjOOt KScE6GPafS5prWrFR9whsymcVLsTByNgYjAavHYR+HJ+qVE98Hi9geD454NIH7R+Fj +JPyzmyORfF4kInMFsoqrU3/zcrwQjPsFJufWZD5VgE9u1KeTnRidJNyQshCk3srAJ sNNU1OpQ92eVJZCX+mjaKTV5Mh2x5LNFVE990Y7aY6x597gqqivbkML6LlDjC68NoV iN325nLhTu0jw== 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.6-stable tree Date: Sat, 7 Nov 2026 05:35:56 -0500 Message-ID: <20261107053556-failed-6.6-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.6-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.6.y git checkout FETCH_HEAD git cherry-pick -x 50f2103fce43922b6e562937b2d2fc62089ff7ec # git commit -s git send-email --to '' --in-reply-to '20261107053556-failed-6.6-50f2103fce43@kernel.org' --subject-prefix 'PATCH 6.6.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