From nobody Tue Jan 2 00:37:12 2024 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 4T3v7X3FwNz55yTR; Tue, 2 Jan 2024 00:37:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T3v7X2jymz3HMN; Tue, 2 Jan 2024 00:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704155832; 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=t+fmblfDUPa056JopiHMgYrzt158Y9VPFuEcWEh3prQ=; b=HcmH8qCek6aw7vh5YN5LcKc3dsbtOpdICukEZxDepUg3mt0bABKzcd383+A7CSC9yoaO/L Ps+SK0K7lUM9fQsMmLw2n9yqMS71VYwVSENmDCh6mr7P+rpwv4Nzl3Jxt+p3Pg5UEQV2GJ aVR1IqCA+yBa5p/ozYZeC/wajEywEpitVhBSYCjYuZ+r+yH4LTer2un+C8fg7Az6Zxt5bR JrJZcjn4LgU1cCabtwSE2ddZB/YGPMhcgBv6rYzhqY+GIoG/uzP75jOCAcXNlqgrmS92Hv ZgdDGJ95rvG1wmQYQrnCU710noDJiLGIzMjTuF7O08oR4lLHra6vDmLQK9Ddkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704155832; a=rsa-sha256; cv=none; b=ZEYzm7e2VFLYAG0Jla04SgnYtlZe975fdSXUW1g6PAxfNijwBvNBcycCQ/QwQfVe4daCFB WQFOAsRJ5lGhlQJDHo0rpMJg8lKenaeESXzzz05UCCtuJ2KgfEHbntMr+wMbtjFFK8un2n QvlyN+TYhVgmY0eOOGXrtSybkV6YIOPe85kpW3eqA3awWz/R+7W5MjVhTQ/nYCQ8dEA9wX Bxye5nZs71hWbFtGOw7/udOr3XV7oLjNMh+XzTkwgKeonLSDBdM1lfHjCW+MST94tFIOUh Y/+YZnLr8dneLt+ThWjvDPav2dzblsrSVY8DB/mYHgrr688OsVtXejz4WFfslw== 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=1704155832; 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=t+fmblfDUPa056JopiHMgYrzt158Y9VPFuEcWEh3prQ=; b=M8Ag7G7yciSNmlzHyXOmY28QqI3Rr8gFuM6PixDQXjSyUq8kculZkJojp/KYJC2BCmfa83 sIRO9pmPFJfm1gkY86rQ702jeMUq0QymwpI5vokw6Nts//TXLakAmonXxDWOGLwG3ZBdRv hsc3eF1v5VFRFU7a41a35yRPKXWUkBxfot/T8BbpDobaD/J5SUhQey6Vt8ySbxZmGeRrhr RjoHfhhQtGFoQbENtMIZGbf+C8L7SiaH0Fi/huaNkFFvP85H9psfzlQa4939Ub2m40RNF5 +XixNyFDEXa00g3IHeYns7fo/ZfmGAtqiwtzHTlF+zSse53V67RXFzIbX6ANnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T3v7X1n61zfGv; Tue, 2 Jan 2024 00:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4020bCJ1084911; Tue, 2 Jan 2024 00:37:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4020bCHX084908; Tue, 2 Jan 2024 00:37:12 GMT (envelope-from git) Date: Tue, 2 Jan 2024 00:37:12 GMT Message-Id: <202401020037.4020bCHX084908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8fa808af6fb9 - stable/14 - freebsd32: Report errors when copying out oldlenp in __sysctl 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8fa808af6fb98fd6cf942f2dac13b35c264552bd Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8fa808af6fb98fd6cf942f2dac13b35c264552bd commit 8fa808af6fb98fd6cf942f2dac13b35c264552bd Author: Mark Johnston AuthorDate: 2023-12-26 01:37:32 +0000 Commit: Mark Johnston CommitDate: 2024-01-02 00:29:42 +0000 freebsd32: Report errors when copying out oldlenp in __sysctl This matches the native implementation's behaviour. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43101 (cherry picked from commit 81eb7baa69e983fe159d254a4ed47d9c00396801) --- sys/compat/freebsd32/freebsd32_misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 5aafc459d60a..41f456d67e5b 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2675,9 +2675,9 @@ freebsd32___sysctl(struct thread *td, struct freebsd32___sysctl_args *uap) uap->new, uap->newlen, &j, SCTL_MASK32); if (error) return (error); - if (uap->oldlenp) - suword32(uap->oldlenp, j); - return (0); + if (uap->oldlenp != NULL && suword32(uap->oldlenp, j) != 0) + error = EFAULT; + return (error); } int