From nobody Thu Apr 16 16:35:26 2026 X-Original-To: dev-commits-src-all@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 4fxNsp4QBHz6ZCbN for ; Thu, 16 Apr 2026 16:35:26 +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 4fxNsp0vGyz3V7N for ; Thu, 16 Apr 2026 16:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776357326; 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=jHxNpWruAeIAr0jOzRIkmpdA97Kr9xuKovus4eldlxQ=; b=eSGTM35XiicvoyjPQsRLVy238UlxgOhDHcB3oOVGfDobxZeBX66PAJ+t2KihjPLZSWbrPh TIw4pTsyQMEV+59uX9R+5+LMq+LMCKzXpKuPyMGjYOIjdUhwNCauzamJ1jFUlceZ4nhIHv hPEZkwbekXklfO1qXfpGkzkmWn5Co6rwMqDEQsgk5OdCj+b/1mKxwfKSe9dc8LZzf6kvhp 9hxEIeXsLj/qns7MsQd60HOH8RkpoEdsNWBJ+9ZLD+Lilbkr5JZCrpWxFTxSZdejj9RGW/ XghDDKAtRZ38VSsebPjWNKrzJ5qKD0Oi9xZSkalta+V/diCsZaNMXYTW2crQkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776357326; a=rsa-sha256; cv=none; b=gZMo4njpeNOVs1JmbRvY0xFsG8D97q5inXqRBTqw3GeuGLE8/wMQ3pTbJohnKGKEhpPLLq cMRGd4nF0pVe4MT5x1IAr11/qT0fQnJJWWf4iIDJP2+RSSVfegGwDSfOB2/srosHMGUJx3 wAwasO+QZezY4cukPSsOjFNnhop7Npc0+JniTKzletQJMHqI1EjNm0vh00F3w+A2ACgb0a l/73R0AOi6WHagf9nFkeOdUzTeYHrxvpA4gh4kt8RsH4m0yxwUEKX67/qU7ta/lCTLy6r+ S7jtk08Pl11CMHvHs0S1nMWB+lmKa0hrizzWkxMH/bV31egFsVmKwgJDp8gkOg== 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=1776357326; 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=jHxNpWruAeIAr0jOzRIkmpdA97Kr9xuKovus4eldlxQ=; b=NGjEo5ftLA9hR4lrdAfL9fZNoV+3zCtcYC4Uz9ZupdmBor2MmlFRoxw34+58SKyvRHAOGj vqoGh7yRw+ucoCkySdcpgZyDPuOdBuF6fcHF6ja+8MnNyDGQfrMtN5meh8fIJ4RwtumHKj EOLYPSo39w5aBOGSBctTM1va2SXqfJHA/5nLxJHkQqMeBBMS38ahrUT4BOvGjptH60JCGt ymvE54BjrijHZr51YzLwT2iZ9JOmvRP2j2DLARCF8ALc7cT1XRg6InwxVfGMWx9aDYSI52 hpJWEzeI2PXWWFjSaG8rNApFB02Ysq7EEph3ViUezWjq1n4pTLOcnNEMS8ofAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxNsp0Mzsz19g for ; Thu, 16 Apr 2026 16:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26641 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 16:35:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Weixie Cui From: Mitchell Horne Subject: git: b77bd0e70d2f - stable/14 - freebsd32: Fix freebsd11_nstat copyout condition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b77bd0e70d2ff3d771a53af82348cdde3f399707 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 16:35:26 +0000 Message-Id: <69e10fce.26641.3bc9660f@gitrepo.freebsd.org> The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b77bd0e70d2ff3d771a53af82348cdde3f399707 commit b77bd0e70d2ff3d771a53af82348cdde3f399707 Author: Weixie Cui AuthorDate: 2026-03-31 10:12:32 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 16:35:00 +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 (cherry picked from commit c6224994ac70b4f71ef9e11903bb2e50ed2b1bfe) --- 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 9aaca6853859..0d35d1291316 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2617,7 +2617,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); }