From nobody Mon Jun 8 21:28:56 2026 X-Original-To: dev-commits-src-main@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 4gZ4t103lMz6gmFk for ; Mon, 08 Jun 2026 21:28:57 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZ4t04kMSz41S7 for ; Mon, 08 Jun 2026 21:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780954136; 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=QNGYmAgOuDaGE49/jI3xexOJSB2RRbOzTkRonQcxeLw=; b=o4ZXHOPQqpn73wBpQqmweypFaMuqW6Ejmq2kLfHcmkH7U+tk6+95NbGuF+g8+mrjBbt6s8 yuygXWxP/ppP3E2T3+SsatDyPT9ThiyaVB6KXetVElUqveGjyKvOI24qs/HxlrLOBYAKZQ jUgZOZU8P+71qvlvNKyBciIFMz3GHLD/rELmwAlc7ddqs6OrWCqBqovb0f2Ow74o5xP3rA whoCxHfX6ZuA2OvFSwNKdVGcUyFBlF+4hX3395y6YSVY+buoUkCvQ1AEw6Ka6fhckvPv36 Q6QgJ00iRhjZKo3dXZ2s4L/mrcOODiLpnWpYQZqmUhoV4GWSbMdptZzmlSf8yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780954136; a=rsa-sha256; cv=none; b=psh3Na9sljVN5JPK4t7kZC/buPQK3g6Ibv8TR0ZFiRe713ULqG7ouIVg2RM39MJV4F6d8z aN5nOUoiR6VdCezMtp4rM52Tu9wUdl2+0ufuz4Ko1cgOoPY0KB39hlu0AsI418I8p1eW5t qQm51FVmmJs3sj31wqm4Viui/26L9J1SRMhdMR8Evm/5Sa8J2RJy23JIUIyR7mvdduJ319 tkDsnF3hhvt7yJra8x0reBDWaDcukxm4mpzS93pfuedpMvo/J6lcM6JL1s7kKGrtUGWPQd cy3fyjW1NzVweAQgQ/8TA3nQnf0ExIxXIBYHvoefDrpMj8+MTubfVXy4zIyE0g== 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=1780954136; 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=QNGYmAgOuDaGE49/jI3xexOJSB2RRbOzTkRonQcxeLw=; b=ai+g9KWixcmcJUNDNg/0xN3PiGp8y9xAHclW/cWHoiqT9DyhdiLD395OrORcr2hh1vdcLW 2RAvJwZErLVYkBrdXMZcw43kOhwYrW1Chf3t4TWBXjx6vJLQ3F9YDI9kv/f61/40Tqenf7 eRBgN5n+enOD7QMOkxfaHIseelPu5JUwdtq6bdyEiRPUcEf+FL3hijF8zbG68gDGLDaLgf YzOh+458cAJ3/Nz0+elumoqgGzx14QEbDyoEqjwP524LkqZmisO4G4pMOYj8hKzjX40ghW +VGEmo9yhyDFDRzGU1y8ERQuObI7dukqUD/NVcFsXx4gUeFLf6eNfeiAG71hqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZ4t03qTRz14Z6 for ; Mon, 08 Jun 2026 21:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19fdd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Jun 2026 21:28:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 471fdd91d915 - main - linux: Fix sockopt copyout List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 471fdd91d9156aeab026dc420fb97d97be872d65 Auto-Submitted: auto-generated Date: Mon, 08 Jun 2026 21:28:56 +0000 Message-Id: <6a273418.19fdd.55d3f832@gitrepo.freebsd.org> The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=471fdd91d9156aeab026dc420fb97d97be872d65 commit 471fdd91d9156aeab026dc420fb97d97be872d65 Author: Chuck Tuffli AuthorDate: 2026-06-08 21:19:34 +0000 Commit: Chuck Tuffli CommitDate: 2026-06-08 21:20:14 +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. MFC after: 1 month Relnotes: yes Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D55881 --- 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 29b55ef60357..12ba6a3adfce 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -2316,10 +2316,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); }