From: Shubham Antil <shubham@octane.security>
To: netdev@vger.kernel.org, linux-rdma@vger.kernel.org
Cc: Allison Henderson <achender@kernel.org>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>,
linux-kernel@vger.kernel.org,
Giovanni Vignone <gio@octane.security>,
sungbyeongchan <tjdqudcks0424@naver.com>
Subject: [PATCH net v3] net/rds: ib: zero the unwritten tail of a short receive fragment
Date: Thu, 8 Oct 2026 18:19:40 +0530 [thread overview]
Message-ID: <20261008124940.13371-1-shubham@octane.security> (raw)
rds_ib_process_recv() accepts an RDS/IB fragment once the receive
completion reports at least an RDS header, and then trusts the
header-declared message length h_len: rds_ib_inc_copy_to_user() later
copies up to h_len bytes from the fragment pages to userspace on
recvmsg().
When a fragment carries fewer payload bytes than h_len accounts for, the
bytes between the end of the received payload and h_len are read from the
unwritten tail of the fragment page. That page comes from the per-CPU
receive cache and is not zeroed, so recvmsg() returns stale page contents
to userspace.
Zero the unwritten tail of a short fragment page on receipt, so the copy
can only ever return received payload or zeros. Fragments that fill the
page are unaffected.
Confirmed under KMSAN: without this change recvmsg() returns stale
frag-page bytes and KMSAN flags an uninitialised copy in
rds_ib_inc_copy_to_user(); with it the same over-read returns zeros and
KMSAN is clean.
Fixes: 1e23b3ee0e94 ("RDS/IB: Receive datagrams via IB")
Reported-by: sungbyeongchan <tjdqudcks0424@naver.com>
Closes: https://lore.kernel.org/netdev/20261006205204.1322102-1-tjdqudcks0424@naver.com/
Reported-by: Shubham Antil <shubham@octane.security>
Reported-by: Giovanni Vignone <gio@octane.security>
Reported-by: Robert van Eijk <robert@octane.security>
Reported-by: Paolo Gentry <paolo@octane.security>
Assisted-by: Claude:claude-opus-4-8
Signed-off-by: Shubham Antil <shubham@octane.security>
---
v3:
- Zero the unwritten fragment tail instead of dropping the connection.
A zero-copy send with a small iovec segment can legitimately produce a
non-final fragment shorter than RDS_FRAG_SIZE, so the v2 length check
could force a reconnect on well-formed traffic; zeroing the tail avoids
that while still keeping uninitialised bytes out of recvmsg().
(Raised by the Sashiko review.)
- Drop Reviewed-by, since the approach changed.
v2:
- Add Reported-by (sungbyeongchan, first to report, and the Octane
Security reporters).
net/rds/ib_recv.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index bd6cb3ffa..9695c7f24 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -35,6 +35,7 @@
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/dma-mapping.h>
+#include <linux/highmem.h>
#include <rdma/rdma_cm.h>
#include "rds_single_path.h"
@@ -949,6 +950,19 @@ static void rds_ib_process_recv(struct rds_connection *conn,
}
}
+ /* The device wrote only data_len bytes into this recycled fragment
+ * page. Zero the unwritten tail so a later rds_ib_inc_copy_to_user(),
+ * which copies up to the peer-declared h_len, cannot hand stale page
+ * contents to userspace.
+ */
+ if (data_len < RDS_FRAG_SIZE) {
+ void *frag = kmap_local_page(sg_page(&recv->r_frag->f_sg));
+
+ memset(frag + recv->r_frag->f_sg.offset + data_len, 0,
+ RDS_FRAG_SIZE - data_len);
+ kunmap_local(frag);
+ }
+
list_add_tail(&recv->r_frag->f_item, &ibinc->ii_frags);
recv->r_frag = NULL;
--
2.43.0
next reply other threads:[~2026-10-08 12:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-08 12:49 Shubham Antil [this message]
2026-10-08 12:53 ` [PATCH net v3] net/rds: ib: zero the unwritten tail of a short receive fragment netdev-bot+sinfo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261008124940.13371-1-shubham@octane.security \
--to=shubham@octane.security \
--cc=achender@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gio@octane.security \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=tjdqudcks0424@naver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox