From nobody Thu Apr 09 16:52:18 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 4fs5ZW0hfyz6YDSH for ; Thu, 09 Apr 2026 16:52:19 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fs5ZV6qJmz4KqC for ; Thu, 09 Apr 2026 16:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775753539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5EbrHla8PpQdm5ZBCXDMZ8Jc4TsR939w4iCQsLCMKBc=; b=D2l+BjKJ1UByrHgfCqnlY79+8a+ivj/b20hHsEy3vIGymN75AVxDT5KegF7frYUl4SjUu5 CBI/YnrQtKndA3c2W7OT/w1Mysauz0tfoiQVWC02E/663mjDhEeJvbt5LBp0hMuZNI49tj jeqqEs8QvevNa/SzoFlmrO2pOgHf6X0uYRTl1iZZks9bRtZm4y0sKHBPDBP1Ep33QRCDnY 4PTGPw26Iy5r94Uem/3thuLRcvKcVBCZOcvOfJMUGSEVc6RzMyoLhA7evEUDH7LhhAkpAJ CcZfsL8iMK1inVjIKFPhqXELfT/6B48Px0s6CIumjDRJRUYAPDTRa3/y85bcfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775753539; a=rsa-sha256; cv=none; b=wrADhpoGq0u62admpItyJG2IFczN+osKlXu8Ms7p3s7VVSrPWC4X6CRi1RAW+RFAXFEY7L rdlJfSWpyoL4IGYBcbpeJ1j2/ZqYBbxPHHr9X3GdFEuxdfVTg6Qm6CR6kLYcjynlySh3+M YwhmgleUclpCcLvbDUMiumd75UUbpdkDMM81G389aShvkQNrq1O0K6YkZgBfqiq1cZiTdT 6NOsDxJFpewVkEg5iEOHI0lxfAoPUHhcpqDfJr5H6Q9PWIvKaRhbl6+8q88Dh1tgXDYLiU dBU7jU4zSxqyhWm9snaZs643InB6OSib97th5QVVKps6S7Kp/3ZNaOx96chZDw== 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=1775753539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5EbrHla8PpQdm5ZBCXDMZ8Jc4TsR939w4iCQsLCMKBc=; b=ijlnfafbo3DL413C50N6VYispc31BVTYWrFJ5DgDLVBGkJ1VRL73TRJqP8kUl8K333Y4QC KZQITuFsBmWSXB0TS1OSOF7n6qwTXZMWZGt8kYgBPWDfY7abi0AsUNl4RcfaiKVzBVYAEN Oi8rYWNKvUSkUNQb8Op/XNo2D6FIPwPN4mm4BW+djdmo0cRwwcPmtAqfUeHHN2OhWLPFrN +KyyPoYWqNLwsRUV21NUkoqbJ0drNCzUw0RpfkV4eTqL6gfucofkGnptgEuoP4eb6uGFYn 0lxv1aBrr0g5rsZrGNKBUGWtOOmWsoeMOVg4eG9+Rec6/SmrJdqcDVOKCi+x1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fs5ZV6PZnz1Ks2 for ; Thu, 09 Apr 2026 16:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26481 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 16:52:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Weixie Cui From: Mitchell Horne Subject: git: c6224994ac70 - main - freebsd32: Fix freebsd11_nstat copyout condition 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6224994ac70b4f71ef9e11903bb2e50ed2b1bfe Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 16:52:18 +0000 Message-Id: <69d7d942.26481.49907a63@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c6224994ac70b4f71ef9e11903bb2e50ed2b1bfe commit c6224994ac70b4f71ef9e11903bb2e50ed2b1bfe Author: Weixie Cui AuthorDate: 2026-03-31 10:12:32 +0000 Commit: Mitchell Horne CommitDate: 2026-04-09 16:46:23 +0000 freebsd32: Fix freebsd11_nstat copyout condition freebsd11_freebsd32_nstat() invoked copyout(2) when freebsd11_cvtnstat32() failed and skipped copyout on success. This is backwards. Fix this to match freebsd11_freebsd32_nlstat() and freebsd11_nstat(), and only copy the nstat32 result to userspace when conversion succeeds. Signed-off-by: Weixie Cui Reviewed by: mhorne MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/2109 --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 4ec6dd452b32..a0b6118900ed 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2649,7 +2649,7 @@ freebsd11_freebsd32_nstat(struct thread *td, if (error != 0) return (error); error = freebsd11_cvtnstat32(&sb, &nsb); - if (error != 0) + if (error == 0) error = copyout(&nsb, uap->ub, sizeof (nsb)); return (error); }