net/rds: ib: drop fragments shorter than the header-declared length
Subsystems (4)
PATCH 1/1 net/rds: ib: drop fragments shorter than the header-declared length
rds_ib_process_recv() accepts an incoming RDS/IB fragment once the receive completion reports at least an RDS header (data_len >= sizeof(struct rds_header)). It then trusts the header-declared total message length h_len: for the first fragment of a message it stores be32_to_cpu(hdr->h_len) in ic->i_recv_data_rem, and rds_ib_inc_copy_to_user() later copies up to h_len bytes from the fragment pages to userspace on recvmsg().
The number of payload bytes actually received into the fragment page is data_len (after subtracting the header), but it is never checked against the amount the fragment is accounted to contribute to the message, min(i_recv_data_rem, RDS_FRAG_SIZE). A fragment whose header advertises a larger h_len than the payload it delivers is still linked onto the reassembly list. The fragment page comes from the per-CPU receive cache and is not zeroed, so rds_ib_inc_copy_to_user() then copies up to h_len bytes to the PF_RDS reader, including the uninitialized tail the receive never wrote.
Reject a fragment that carries fewer payload bytes than it is accounted to contribute before linking it onto the reassembly list.
The issue is reproducible under KMSAN with two hosts over rdma_rxe (Soft-RoCE); the same reproducer confirms the fix stops it.
--- net/rds/ib_recv.c | 9 +++++++++ 1 file changed, 9 insertions(+)
net/rds/ib_recv.c +9 -0
@@ -949,6 +949,15 @@ static void rds_ib_process_recv(struct rds_connection *conn, } } +/* h_len must be backed by the payload actually received (data_len), +* else the unwritten frag-page tail is copied to userspace. +*/ +if (data_len <min_t (u32, ic->i_recv_data_rem,RDS_FRAG_SIZE )) { +rds_ib_conn_error (conn, +"fragment shorter than header-declared length; forcing reconnect\n" ); + goto done; + } +list_add_tail (&recv->r_frag->f_item, &ibinc->ii_frags); recv->r_frag =NULL ;
Signature · 1 line
2.43.0
[email protected]
AI reviewSashiko has reviewed this patch and found no issues. It looks great!
Quoted 21 lines
rds_ib_process_recv()accepts an incoming RDS/IB fragment once the receive completion reports at least an RDS header (data_len>=sizeof(struct rds_header)). It then trusts the header-declared total message lengthh_len: for the first fragment of a message it storesbe32_to_cpu(hdr->h_len)inic->i_recv_data_rem, andrds_ib_inc_copy_to_user()later copies up toh_lenbytes from the fragment pages to userspace onrecvmsg().The number of payload bytes actually received into the fragment page is
data_len(after subtracting the header), but it is never checked against the amount the fragment is accounted to contribute to the message,min(i_recv_data_rem, RDS_FRAG_SIZE). A fragment whose header advertises a largerh_lenthan the payload it delivers is still linked onto the reassembly list. The fragment page comes from the per-CPU receive cache and is not zeroed, sords_ib_inc_copy_to_user()then copies up toh_lenbytes to thePF_RDSreader, including the uninitialized tail the receive never wrote.Reject a fragment that carries fewer payload bytes than it is accounted to contribute before linking it onto the reassembly list.
Quoted 6 lines
The issue is reproducible under KMSAN with two hosts over
rdma_rxe(Soft-RoCE); the same reproducer confirms the fix stops it.Fixes 1e23b3ee0e94 ("RDS/IB: Receive datagrams via IB")Assisted-by Claude:claude-opus-4-8Signed-off-by Shubham Antil <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 21 lines · Shubham Antil
rds_ib_process_recv()accepts an incoming RDS/IB fragment once the receive completion reports at least an RDS header (data_len>=sizeof(struct rds_header)). It then trusts the header-declared total message lengthh_len: for the first fragment of a message it storesbe32_to_cpu(hdr->h_len)inic->i_recv_data_rem, andrds_ib_inc_copy_to_user()later copies up toh_lenbytes from the fragment pages to userspace onrecvmsg().The number of payload bytes actually received into the fragment page is
data_len(after subtracting the header), but it is never checked against the amount the fragment is accounted to contribute to the message,min(i_recv_data_rem, RDS_FRAG_SIZE). A fragment whose header advertises a largerh_lenthan the payload it delivers is still linked onto the reassembly list. The fragment page comes from the per-CPU receive cache and is not zeroed, sords_ib_inc_copy_to_user()then copies up toh_lenbytes to thePF_RDSreader, including the uninitialized tail the receive never wrote.Reject a fragment that carries fewer payload bytes than it is accounted to contribute before linking it onto the reassembly list.
Quoted 6 lines
The issue is reproducible under KMSAN with two hosts over
rdma_rxe(Soft-RoCE); the same reproducer confirms the fix stops it.Fixes 1e23b3ee0e94 ("RDS/IB: Receive datagrams via IB")Assisted-by Claude:claude-opus-4-8Signed-off-by Shubham Antil <[email protected]>
Hi Shubham,
Thanks for working on this. This patch looks good to me, you can add my rvb:
Also, this bug was found and reported privately by another contributor, whom I had counseled to send a patch publicly before I had noticed this one.
https://lore.kernel.org/netdev/[email protected]/
I find that patches equivalent, and this patch was posted first. But I would like to apply the reported by tag since sungbyeongchan was the first to report it.
Thank you both for working on this bug!
Allison
Quoted 24 lines
--- net/rds/ib_recv.c | 9 +++++++++ 1 file changed, 9 insertions(+)net/rds/ib_recv.c +9
-0@@ -949,6 +949,15 @@ static void rds_ib_process_recv(struct rds_connection *conn, } } +/* h_len must be backed by the payload actually received (data_len), +* else the unwritten frag-page tail is copied to userspace. +*/ +if (data_len <min_t (u32, ic->i_recv_data_rem,RDS_FRAG_SIZE )) { +rds_ib_conn_error (conn, +"fragment shorter than header-declared length; forcing reconnect\n" ); + goto done; + } +list_add_tail (&recv->r_frag->f_item, &ibinc->ii_frags); recv->r_frag =NULL ;
Shubham Antil
Reviewed-by Allison HendersonHi Allison,
Thanks very much — I'll carry your Reviewed-by on the next revision:
And no objection at all to crediting the earlier private report:
This bug was found and reported by our team at Octane Security. Would it be okay if we add Reported-by tags for the people on our side who reported it along with the first reporter in the V2 patch?
I'm happy to send a v2 with everything folded in - your Reviewed-by, sungbyeongchan's Reported-by and ours. Just let me know which you prefer.
Thanks again,
Shubham Antil
Quoted 71 lines · Allison Henderson
Quoted 21 lines · Shubham Antil
rds_ib_process_recv()accepts an incoming RDS/IB fragment once the receive completion reports at least an RDS header (data_len>=sizeof(struct rds_header)). It then trusts the header-declared total message lengthh_len: for the first fragment of a message it storesbe32_to_cpu(hdr->h_len)inic->i_recv_data_rem, andrds_ib_inc_copy_to_user()later copies up toh_lenbytes from the fragment pages to userspace onrecvmsg().The number of payload bytes actually received into the fragment page is
data_len(after subtracting the header), but it is never checked against the amount the fragment is accounted to contribute to the message,min(i_recv_data_rem, RDS_FRAG_SIZE). A fragment whose header advertises a largerh_lenthan the payload it delivers is still linked onto the reassembly list. The fragment page comes from the per-CPU receive cache and is not zeroed, sords_ib_inc_copy_to_user()then copies up toh_lenbytes to thePF_RDSreader, including the uninitialized tail the receive never wrote.Reject a fragment that carries fewer payload bytes than it is accounted to contribute before linking it onto the reassembly list.
Quoted 6 lines
The issue is reproducible under KMSAN with two hosts over
rdma_rxe(Soft-RoCE); the same reproducer confirms the fix stops it.Fixes 1e23b3ee0e94 ("RDS/IB: Receive datagrams via IB")Assisted-by Claude:claude-opus-4-8Signed-off-by Shubham Antil <[email protected]>Hi Shubham,
Thanks for working on this. This patch looks good to me, you can add my rvb:
Reviewed-by Allison Henderson <[email protected]>Also, this bug was found and reported privately by another contributor, whom I had counseled to send a patch publicly before I had noticed this one.
https://lore.kernel.org/netdev/[email protected]/I find that patches equivalent, and this patch was posted first. But I would like to apply the reported by tag since sungbyeongchan was the first to report it.
Reported-by sungbyeongchan <[email protected]>Thank you both for working on this bug!
AllisonQuoted 24 lines
--- net/rds/ib_recv.c | 9 +++++++++ 1 file changed, 9 insertions(+)net/rds/ib_recv.c +9
-0@@ -949,6 +949,15 @@ static void rds_ib_process_recv(struct rds_connection *conn, } } +/* h_len must be backed by the payload actually received (data_len), +* else the unwritten frag-page tail is copied to userspace. +*/ +if (data_len <min_t (u32, ic->i_recv_data_rem,RDS_FRAG_SIZE )) { +rds_ib_conn_error (conn, +"fragment shorter than header-declared length; forcing reconnect\n" ); + goto done; + } +list_add_tail (&recv->r_frag->f_item, &ibinc->ii_frags); recv->r_frag =NULL ;
Allison Henderson
maintainerQuoted 10 lines · Shubham Antil
Hi Allison,
Thanks very much — I'll carry your Reviewed-by on the next revision:
Reviewed-by Allison Henderson <[email protected]>And no objection at all to crediting the earlier private report:
Reported-by sungbyeongchan <[email protected]>
Quoted 8 lines
This bug was found and reported by our team at Octane Security. Would it be okay if we add Reported-by tags for the people on our side who reported it along with the first reporter in the V2 patch?
Reported-by Shubham Antil <[email protected]>Reported-by Giovanni Vignone <[email protected]>Reported-by Robert van Eijk <[email protected]>Reported-by Paolo Gentry <[email protected]>
Sure, that's fine. Thank you!
Allison
Quoted 80 lines
I'm happy to send a v2 with everything folded in - your Reviewed-by, sungbyeongchan's Reported-by and ours. Just let me know which you prefer.
Thanks again,
Shubham AntilQuoted 71 lines · Allison Henderson
Quoted 21 lines · Shubham Antil
rds_ib_process_recv()accepts an incoming RDS/IB fragment once the receive completion reports at least an RDS header (data_len>=sizeof(struct rds_header)). It then trusts the header-declared total message lengthh_len: for the first fragment of a message it storesbe32_to_cpu(hdr->h_len)inic->i_recv_data_rem, andrds_ib_inc_copy_to_user()later copies up toh_lenbytes from the fragment pages to userspace onrecvmsg().The number of payload bytes actually received into the fragment page is
data_len(after subtracting the header), but it is never checked against the amount the fragment is accounted to contribute to the message,min(i_recv_data_rem, RDS_FRAG_SIZE). A fragment whose header advertises a largerh_lenthan the payload it delivers is still linked onto the reassembly list. The fragment page comes from the per-CPU receive cache and is not zeroed, sords_ib_inc_copy_to_user()then copies up toh_lenbytes to thePF_RDSreader, including the uninitialized tail the receive never wrote.Reject a fragment that carries fewer payload bytes than it is accounted to contribute before linking it onto the reassembly list.
Quoted 6 lines
The issue is reproducible under KMSAN with two hosts over
rdma_rxe(Soft-RoCE); the same reproducer confirms the fix stops it.Fixes 1e23b3ee0e94 ("RDS/IB: Receive datagrams via IB")Assisted-by Claude:claude-opus-4-8Signed-off-by Shubham Antil <[email protected]>Hi Shubham,
Thanks for working on this. This patch looks good to me, you can add my rvb:
Reviewed-by Allison Henderson <[email protected]>Also, this bug was found and reported privately by another contributor, whom I had counseled to send a patch publicly before I had noticed this one.
https://lore.kernel.org/netdev/[email protected]/I find that patches equivalent, and this patch was posted first. But I would like to apply the reported by tag since sungbyeongchan was the first to report it.
Reported-by sungbyeongchan <[email protected]>Thank you both for working on this bug!
AllisonQuoted 24 lines
--- net/rds/ib_recv.c | 9 +++++++++ 1 file changed, 9 insertions(+)net/rds/ib_recv.c +9
-0@@ -949,6 +949,15 @@ static void rds_ib_process_recv(struct rds_connection *conn, } } +/* h_len must be backed by the payload actually received (data_len), +* else the unwritten frag-page tail is copied to userspace. +*/ +if (data_len <min_t (u32, ic->i_recv_data_rem,RDS_FRAG_SIZE )) { +rds_ib_conn_error (conn, +"fragment shorter than header-declared length; forcing reconnect\n" ); + goto done; + } +list_add_tail (&recv->r_frag->f_item, &ibinc->ii_frags); recv->r_frag =NULL ;