Skip to content

Commit e63f9ad

Browse files
edumazetUlrich Hecht
authored andcommitted
sctp: prevent possible shift-out-of-bounds in sctp_transport_update_rto
[ Upstream commit 1534ff77757e44bcc4b98d0196bc5c0052fce5fa ] syzbot reported a possible shift-out-of-bounds [1] Blamed commit added rto_alpha_max and rto_beta_max set to 1000. It is unclear if some sctp users are setting very large rto_alpha and/or rto_beta. In order to prevent user regression, perform the test at run time. Also add READ_ONCE() annotations as sysctl values can change under us. [1] UBSAN: shift-out-of-bounds in net/sctp/transport.c:509:41 shift exponent 64 is too large for 32-bit type 'unsigned int' CPU: 0 UID: 0 PID: 16704 Comm: syz.2.2320 Not tainted syzkaller #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/02/2025 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x16c/0x1f0 lib/dump_stack.c:120 ubsan_epilogue lib/ubsan.c:233 [inline] __ubsan_handle_shift_out_of_bounds+0x27f/0x420 lib/ubsan.c:494 sctp_transport_update_rto.cold+0x1c/0x34b net/sctp/transport.c:509 sctp_check_transmitted+0x11c4/0x1c30 net/sctp/outqueue.c:1502 sctp_outq_sack+0x4ef/0x1b20 net/sctp/outqueue.c:1338 sctp_cmd_process_sack net/sctp/sm_sideeffect.c:840 [inline] sctp_cmd_interpreter net/sctp/sm_sideeffect.c:1372 [inline] Fixes: b58537a ("net: sctp: fix permissions for rto_alpha and rto_beta knobs") Reported-by: syzbot+f8c46c8b2b7f6e076e99@syzkaller.appspotmail.com Closes: https://lore.kernel.org/netdev/690c81ae.050a0220.3d0d33.014e.GAE@google.com/T/#u Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Xin Long <lucien.xin@gmail.com> Link: https://patch.msgid.link/20251106111054.3288127-1-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> [uli: backport to 4.19] Signed-off-by: Ulrich Hecht <uli@kernel.org> Reviewed-by: Pavel Machek <pavel@nabladev.com>
1 parent d158f5e commit e63f9ad

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

net/sctp/transport.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ void sctp_transport_update_rto(struct sctp_transport *tp, __u32 rtt)
352352

353353
if (tp->rttvar || tp->srtt) {
354354
struct net *net = sock_net(tp->asoc->base.sk);
355+
unsigned int rto_beta, rto_alpha;
355356
/* 6.3.1 C3) When a new RTT measurement R' is made, set
356357
* RTTVAR <- (1 - RTO.Beta) * RTTVAR + RTO.Beta * |SRTT - R'|
357358
* SRTT <- (1 - RTO.Alpha) * SRTT + RTO.Alpha * R'
@@ -363,10 +364,14 @@ void sctp_transport_update_rto(struct sctp_transport *tp, __u32 rtt)
363364
* For example, assuming the default value of RTO.Alpha of
364365
* 1/8, rto_alpha would be expressed as 3.
365366
*/
366-
tp->rttvar = tp->rttvar - (tp->rttvar >> net->sctp.rto_beta)
367-
+ (((__u32)abs((__s64)tp->srtt - (__s64)rtt)) >> net->sctp.rto_beta);
368-
tp->srtt = tp->srtt - (tp->srtt >> net->sctp.rto_alpha)
369-
+ (rtt >> net->sctp.rto_alpha);
367+
rto_beta = READ_ONCE(net->sctp.rto_beta);
368+
if (rto_beta < 32)
369+
tp->rttvar = tp->rttvar - (tp->rttvar >> rto_beta)
370+
+ (((__u32)abs((__s64)tp->srtt - (__s64)rtt)) >> rto_beta);
371+
rto_alpha = READ_ONCE(net->sctp.rto_alpha);
372+
if (rto_alpha < 32)
373+
tp->srtt = tp->srtt - (tp->srtt >> rto_alpha)
374+
+ (rtt >> rto_alpha);
370375
} else {
371376
/* 6.3.1 C2) When the first RTT measurement R is made, set
372377
* SRTT <- R, RTTVAR <- R/2.

0 commit comments

Comments
 (0)