From nobody Thu Apr 16 15:28:34 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 4fxMNg0ZSmz6ZrLG for ; Thu, 16 Apr 2026 15:28:35 +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 4fxMNf5ccTz3G6V for ; Thu, 16 Apr 2026 15:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776353314; 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=hiTMTzA6mONjJgGUcdv5Wkul70YGvowWShyooZr2EhY=; b=bHLVPq//5YEHGr5j1XjYsPqlgj22Oo/NBKXXbhrj0kkNwBKSXHYc846nKtiQKI7Utw8TCH TnPm/UEerLLfTYJvP7PdAMM2onpfHUalx4JtkK24lTaXtJ37DkHGl3b2FGu/NZ8s+gwACP lagu9byNRXcj0XQk53MGzeqLNbTiKWXoseRVsA9JW8P43DHmmaqzcS8FBUvp2xTbQ4pmjL QngMqcTpzxYwgVcF2zJ49xQQnnQpqaS5+h62IbOhSpbPIKgXUa8D+mqotLuNJ1wTUxyM8f BIEaJhHKLJ7nPkTp/d6bGTJPzJH80XS8xlJuCzZ3mmmvVpLTeanfP5Id7jDmIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776353314; a=rsa-sha256; cv=none; b=a1mMQXb1k2PetWYT0exWXMi6avMRJ98aXLHT4ux+bfp0x2QWNMcGw2YAI8kXRtcAw2STae +aQU3aqw5PyQnyy4MnPn9hgbkYvoiY9VdkwsEbBB44Nwjjjb90zclTdCmRpiyRpcGEJ3pl m2yHRHpcVbnriwKezvU/s3Pyl3NPMVUQ9IYs1YZh3js4TDiHGhgoOJI/w/g1oG2llvCxqH tc8tVcmPx4I0J0fL0qik/axr60skKY5rdlszerWOAG4h2nhqv3bck5KwrUo9f3rBZLa7uj WVcZ5rw0uF/jj9R8LVkAdRReyZ592itoPvMorCmEo/DbWyBwRQp75SLHIXRgFA== 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=1776353314; 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=hiTMTzA6mONjJgGUcdv5Wkul70YGvowWShyooZr2EhY=; b=lj8pArp7aCTdVbs6E2bb1GtqqYNKgbv2JhYRCTH6qnx9ehy3ZCQjit3TYcrqWCx7pmm4GC bHuTBmy/7rKaIDnl5Lifzv+0ZgTnLqT6e+Dk1vEHu41gwtbOhRX2VQE68GirLQUaptI5fQ l5mKaYI0izIKgFVqjmFcjUjHPJ2gwx/AFCAHpvCqBn7MSSUHHJPm7dHVkOpFYB0jnMMU8H /bt+jPsHjynHN56A5l4+Wsd8ni/3QBhgblfmdIfg+EfLYeY0+8py6nuhbx2TS9laCtJcTc CyhZUheLpEM4oLyF6stFncH4HbuJoU/05mWwSotEwdIrDofnCrnKBp8CuccSfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxMNf4t7hz1CTj for ; Thu, 16 Apr 2026 15:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fbb0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:28:34 +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: 3f68410ae7a5 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 3f68410ae7a574c5ac7a4409646e8a0e80e5c5c8 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:28:34 +0000 Message-Id: <69e10022.1fbb0.89178e9@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3f68410ae7a574c5ac7a4409646e8a0e80e5c5c8 commit 3f68410ae7a574c5ac7a4409646e8a0e80e5c5c8 Author: Weixie Cui AuthorDate: 2026-03-31 10:12:32 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 15:25:58 +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 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); }