From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92E4436897F for ; Thu, 25 Jun 2026 14:24:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782397449; cv=none; b=C5OSOitQ+qSHC5IeQWM+Gy6nH29aMugHHM1ZEypVtYroJDM/t6Q+LHr1Gd9yMAd0ajXMdQYm2pOR/bEHgnfStfzJTU/5Mgh6CMBWxU7Yb85VPjuVJeLVv3Nx816o4gNjaPpGMZcanw/g4nDv/CGGXqrq0e4q/Gt0dB3X94bS81c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782397449; c=relaxed/simple; bh=rCIrhKaVvNsvBmWDzhf3JByNk8xelVBOQxmn+E99qrM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qEiDykZ920T79AVnODnDgZq9Xm2ZDjuS3xEdaD9jxbzzihRlfTrUic4EY6ONMJvuOI5efgHp4u0sJXebbTbIK7K/YWkml9q8mtxNuAYXSMDc1wCZBFW1/SphsMrYrTLgV4FJPm34M06Bgf9MBGpuYALg04AAnkgVmgUvSp8qpXI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ghto8w2p; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ghto8w2p" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-490b3637b90so15607805e9.3 for ; Thu, 25 Jun 2026 07:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782397446; x=1783002246; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=c5/8DfMwYFHn82COsAU7YI6hnYfW2lO8oL7jTwFmEsY=; b=Ghto8w2pcGq+cRzAObj7GCDoVMbUEAvzA6ntf+vY8mkbNiDM/qudMiOwuhqJvM454j /8wk5nqFlPLh7OYgkqiioPuB+3+AnMLuudH7SWj1ZxhWEOXzM7CaNQXekRv8sNOBoY89 BewZ7JzfJXTw81xXYUVOg1YfQY2QWf4Oy4F2LooKSyobNtp/R3J7qzl5cHkKZuCQSPl2 LAqOChn5OsQJmWcIGVdYddLtLke2Ya+K/RHphKUvCXlhHS9Df3p/FIQ9yMCwCc0WbNRw /EiP2BO19FibKD4MivPAWZSnBKCApenhIXk27wWT4F8eh1mkA74mytVTZYH5nKiitFKa Pxrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782397446; x=1783002246; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=c5/8DfMwYFHn82COsAU7YI6hnYfW2lO8oL7jTwFmEsY=; b=AuOncAXE2BUllhY809DmkTiif9ZVuaXO/s7EbwIDCuwhl22P0HRPdKYms7GyvJlesV cHcAEtP3o4kyupWVt8zJTy55WC+CkJ/SasRZzDYJvjUCd+HTwqx97Zn6dajMIWhawkGV AmBVGn1fhsls88p+1+uFC4N0ulflWD64xAsw/3s0bHq6DLXz2f7TkZt+tEJOxbwBk9Gu c86G5tXieDVKLZVL+VXbnx1i2V1dZBcfBi5lC4xu5mMfomfijOH5eLkt7gG6ShqkEcQ1 h1Dku7MDoQiV/Jq5ROAyGBTVgYDM+SLfDBBM6swFBtgw8AhQY+md2JetRf2TANx1E3/8 IPaA== X-Forwarded-Encrypted: i=1; AFNElJ8YBPniBLBiGuWmIXaGkGtDi4s76nKo48/rr7Y6U8wyV/1VHQdJUv/4YiKrYf2QCB5vYgfCFqH+8aOsDVo=@vger.kernel.org X-Gm-Message-State: AOJu0YwjpIPeYWIt4VRAj5dWdd9PaM4xZmhva1+n6k1olBpTuNJZ8jt4 8ongdYSun6BgB3o13skOhh5qozFtGTbQE5Rz8NI9O6DpqFhKMkp/n/e5iGdrdlAyXspEiQ== X-Gm-Gg: AfdE7cmw2Kggzyoot6/GRfZHTdnvJ33wRGfp+Pvv0FzCIBYd0JPFbG8P3InMuXAhe6a 7R7G8505exkxXyA9ZXUlSzBDGQzt4T/z41kFMZbMgyDAbP386O+h0kzXUA7XZ8BrZMKdBfyDEiP n4MLYREszoYhJefYSv0SBBk4nLAnT3mYSBjtpPpjYxDUgwHU9VhhQq+lxmVC/rD9m5T764AK38o 5B1sK8X8jhwgBidyqm5fUbjnwCDhcatybfnvM0WPza5a+mHD/IVLSDvWYv7Sej9cu9U7YY/42Sh tKRX/OnXthbZiJiADxuBWZUYXRIq1ou4ecMtFTqfFVVxmIcoMLYE8byoPk45e4ncIZeMVWjdHL4 4oyxwOa8NHZP477FFFRgdlaH4JNaVcR8+8nuXrOjkE1j+qcOiHOFRlHxqElMD1JOcA3FivrenGr sSe79AxWd5YtUNLlwxKhY8vZ+3ag== X-Received: by 2002:a05:600c:8b25:b0:492:40a1:1e16 with SMTP id 5b1f17b1804b1-4926684a70bmr39636275e9.8.1782397445676; Thu, 25 Jun 2026 07:24:05 -0700 (PDT) Received: from Dev-Null-MSI ([2a0d:3344:52ac:a808:98a4:4381:be45:536f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49268fc0d36sm1997075e9.2.2026.06.25.07.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 07:24:05 -0700 (PDT) From: Yousef Alhouseen To: Marcelo Ricardo Leitner , Xin Long Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-sctp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yousef Alhouseen Subject: [PATCH net v2] sctp: fix SCTP_RESET_STREAMS stream list length limit Date: Thu, 25 Jun 2026 16:23:54 +0200 Message-ID: <20260625142354.2600-1-alhouseenyousef@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit SCTP_RESET_STREAMS carries a flexible array of u16 stream IDs, but the optlen clamps treat USHRT_MAX as a byte count and then multiply sizeof(__u16) by the fixed header size. That caps the copied and validated option buffer at about 64 KiB, which rejects valid requests containing more than about half of the u16 stream ID range. Use struct_size_t() for the maximum struct sctp_reset_streams layout instead, so the bound matches the flexible array described by srs_number_streams. Fixes: 5960cefab9df ("sctp: add a ceiling to optlen in some sockopts") Acked-by: Xin Long Signed-off-by: Yousef Alhouseen --- Changes in v2: - Add Fixes and Acked-by tags from Xin Long. - v1: https://lore.kernel.org/r/20260624122213.4052-1-alhouseenyousef@gmail.com net/sctp/socket.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 66e12fb0c..b8f13044a 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4111,8 +4111,9 @@ static int sctp_setsockopt_reset_streams(struct sock *sk, if (optlen < sizeof(*params)) return -EINVAL; /* srs_number_streams is u16, so optlen can't be bigger than this. */ - optlen = min_t(unsigned int, optlen, USHRT_MAX + - sizeof(__u16) * sizeof(*params)); + optlen = min_t(unsigned int, optlen, + struct_size_t(struct sctp_reset_streams, srs_stream_list, + USHRT_MAX)); if (params->srs_number_streams * sizeof(__u16) > optlen - sizeof(*params)) @@ -4598,8 +4599,8 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, if (optlen > 0) { /* Trim it to the biggest size sctp sockopt may need if necessary */ optlen = min_t(unsigned int, optlen, - PAGE_ALIGN(USHRT_MAX + - sizeof(__u16) * sizeof(struct sctp_reset_streams))); + PAGE_ALIGN(struct_size_t(struct sctp_reset_streams, + srs_stream_list, USHRT_MAX))); kopt = memdup_sockptr(optval, optlen); if (IS_ERR(kopt)) return PTR_ERR(kopt); -- 2.54.0