From nobody Wed Jul 8 21:59:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gwX7f3rw0z6kx69 for ; Wed, 08 Jul 2026 21:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gwX7f0lXdz3Sp8 for ; Wed, 08 Jul 2026 21:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783547982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JifCXEVdS2587ViTYGY+Blcf3ZTILUbZalZk9Y+WII8=; b=ZOgvNLGcJHlzD1MDlAxJ1vSaotOKeUG8Q60qcEyqKgyZyDmg31zsy6bBEmIpA9KegYDyzU +VvShmwLTXtfUeEkH8eDMD9lgYn8WbAXeddHaKr+56U3GFSCE3Gx9p2r/SRHLs37GV5fhR zoCgSM866C/8vDDho91PqgZsXlbvlRNgmXvcN+De6CnATmhWfHkIPjn2ZrRu0t8TJfk1Hh sTtNr1JmlyvFC+Pm1Rbtg54m7bJRMUuk0R1hqyftsyYp0zDv5DqQQqDPNZPQtR0bXp+Z88 pQU7BmDnSH7R7mwaUGJD+97iUl4xUo/QGVjqtbGJiDbuSwkBUC1JGGrKj+LN4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783547982; a=rsa-sha256; cv=none; b=ZIIQs/3uH9hryuix79q+Dc3mflux5nZU0cBf2IikhskEBAQ23fDZfeTRE20Km9lPFe4z1R qHvQLw8YlOPKcXA7AVwGf1pdEV2hoFJ/HtS0gkhoJ2UmbRP/6ygTpuQbpYu5B4gPdoUnZ9 3ZNdgYbz4Y23TnX9kbVakpSz0u8+lmlUWbtyT89f+D2ejjL+z4LqWt1cQJ87nOtt1t76ra Hj9gKoBlgj7lWSKgYLwP5uEGJ8q7/Fe2jHZg+uvadsjDOi/DONf0BUueKuArEmIeApi76L v51LRV5X6OhJ2b82EyuLFZ5UKt59Jw09vKUtrAhV+yfJ8fuWf0lEAJHgQ0fkVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783547982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JifCXEVdS2587ViTYGY+Blcf3ZTILUbZalZk9Y+WII8=; b=oUeC8rf8bzvOREqTqMhTpmDUdfWn91rMshVlszN7OYMmosrZbLpLViTS4zY8dFFWKDbO1S 9jp/KopR7hoUMEvRA7unYtHqex/AExnJC/ZEsZ2kuYTC3K7psvC8R11Hz3uJ6IyAq7Ax5l Zz9RJwYzkbGn61PeV7v548V1w4swR0R5MXKT9nAVzTWD/Z0W9q3WOaK00eQsHD89rlo9eY COUimtlymm8+XXIaiUb/aZh+iRORl8l46/f2w3SkshTk6jjvdF1M3Vp7IM5oLcNNX2hJAe IMV3KQ9Q3uGVa0CWN2igxwo5hAoaAHJ97PJGMf5vFhz/XxCRTlmZXToGB1XjIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gwX7d6xLgzh8x for ; Wed, 08 Jul 2026 21:59:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31b4e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Jul 2026 21:59:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: fa65155b3fa4 - stable/15 - linux: Fix sockopt copyout List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.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 X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fa65155b3fa44111e9b8217973714055bf721838 Auto-Submitted: auto-generated Date: Wed, 08 Jul 2026 21:59:41 +0000 Message-Id: <6a4ec84d.31b4e.32bc0668@gitrepo.freebsd.org> The branch stable/15 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=fa65155b3fa44111e9b8217973714055bf721838 commit fa65155b3fa44111e9b8217973714055bf721838 Author: Chuck Tuffli AuthorDate: 2026-06-08 21:19:34 +0000 Commit: Chuck Tuffli CommitDate: 2026-07-08 21:43:31 +0000 linux: Fix sockopt copyout The Linux getsockopt did not check the size of the provided buffer when copying out the value, leading to buffer overflows (e.g., for TCP_INFO). Fix is to use the smaller of the option value size and the provided buffer. (cherry picked from commit 471fdd91d9156aeab026dc420fb97d97be872d65) --- sys/compat/linux/linux_socket.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 0e07b0a60ced..615ef12ec201 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -2168,10 +2168,21 @@ linux_sockopt_copyout(struct thread *td, void *val, socklen_t len, struct linux_getsockopt_args *args) { int error; + l_int loptlen; + socklen_t optlen; - error = copyout(val, PTRIN(args->optval), len); - if (error == 0) - error = copyout(&len, PTRIN(args->optlen), sizeof(len)); + error = copyin(PTRIN(args->optlen), &loptlen, sizeof(loptlen)); + if (error != 0) + return (error); + if (loptlen < 0) + return (EINVAL); + + optlen = (socklen_t)loptlen; + error = copyout(val, PTRIN(args->optval), min(len, optlen)); + if (error == 0) { + loptlen = (l_int)len; + error = copyout(&loptlen, PTRIN(args->optlen), sizeof(loptlen)); + } return (error); }