From nobody Tue Jan 2 00:37:24 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 4T3v7n2Wmxz55yTl; Tue, 2 Jan 2024 00:37:25 +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 4T3v7n0DLLz3Hys; Tue, 2 Jan 2024 00:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704155845; 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=+YOMoDEw5kEBDTDWrcaYKJ5NM2OmJu1ds/M3nUBGnu8=; b=t9C2+FmyQWCGXskBw70uNWHSeSK783b/MTZ8uJVscDiISeYLoi48XmRNTuSMXV5sZz/DKW tPFCWU9HBf1sPBtJGxan/CPGugu9ITym5V9v641GWz9JwfSUXqOyr0+6ZhkFD+ogY8hs8W yBAplCwL656P6RFXZpSa/xRORvX4KgrcGReDJS2weNnGnSyehT8sfkd9YWR8loPgJqYHRl hRX0awbdyJjgKCnab2LOS+i0SIS+Zdhe3HJbRwT1Nu9tefxSOLWxygLLBQvHl9uatsvJw0 EJ6CRdosmnVoOxjHmyVVbjWRFEVEsNW854xMmfQeojP/iRxi8CwQ+AO8azxlBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704155845; a=rsa-sha256; cv=none; b=Xo5XiWlLIdo6rbqMgBhiypElHwtDAgzTqoEW7VoayTEzeMBi3TUGAE/PMy211Qy3q2Mdfz 9NEfSFyf6wb7F9cXZVz6LXTSwbRU2Xo3NbH6nL6s9HZ8oNC2GbfmAR55Syr6Lo1iT4KzGA 7zUBlSBmyYNlcJlxZvzjJc2RVK2UgHRShz6/5aBtvREh8pas1BvHT5PnHdbqDmpzaxDkmk eMVBVrkyS5YhGCd6C8DHzwwe/eNc5ycZYcTfYmUj1xqhjTa69bigrgdDZMi4I93GKHoiSU olIdi93BcaRV1GfkKsceL+Jq8RbUyZS9Dstb+ZYRtVlV0YlvpnDblMfKMSsXTw== 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=1704155845; 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=+YOMoDEw5kEBDTDWrcaYKJ5NM2OmJu1ds/M3nUBGnu8=; b=EPQmyuurzcOcy+BTaKRMhmq6GL1agHTo+S4LbsQZnI/TwXjZGFbtCLpklDqZVHFmVUhwSq zK9BQ415ljCzQhqjCkFteO55xPIXZVe+B6Z7AdXhUwnOcwAQrpLQg+ptU8vvliIfuDi/rD VTUZjg0FT05BULBXsE12rYVvEFSpokjEd6/bnC3hCFVpLIYb2pE7CUmqmM1aU1/3KZ1ZXw Kw10eD8LtkFJ7PXRh2x2d6mNFaHuC6eVxr4Q6o9n2NUj9/zqBH8LSjxORHhycxJyFH5Sof PNZ+kjXreLvDczxiJSkVSH8m+dRCOh5raN+LBugfwFUIyobBw3+tosZyu7I4eg== 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 4T3v7m6PvqzfbC; Tue, 2 Jan 2024 00:37:24 +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 4020bOtr085486; Tue, 2 Jan 2024 00:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4020bOAA085483; Tue, 2 Jan 2024 00:37:24 GMT (envelope-from git) Date: Tue, 2 Jan 2024 00:37:24 GMT Message-Id: <202401020037.4020bOAA085483@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: 4b4f8106bdfb - stable/14 - jail: Ignore errors from copyout() while copying the error string 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: 4b4f8106bdfbf2dd03f89bc8ea02c6991de0555a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4b4f8106bdfbf2dd03f89bc8ea02c6991de0555a commit 4b4f8106bdfbf2dd03f89bc8ea02c6991de0555a Author: Mark Johnston AuthorDate: 2023-12-26 01:41:54 +0000 Commit: Mark Johnston CommitDate: 2024-01-02 00:29:52 +0000 jail: Ignore errors from copyout() while copying the error string Reviewed by: zlei, jamie MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43142 (cherry picked from commit abbc260f74b203646dd108ad4038627fcfb0ded7) --- sys/kern/kern_jail.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 57e6024a9939..e95008be42e8 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2163,7 +2163,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) optuio->uio_iov[errmsg_pos].iov_base, errmsg_len); else - copyout(errmsg, + (void)copyout(errmsg, optuio->uio_iov[errmsg_pos].iov_base, errmsg_len); } @@ -2548,7 +2548,7 @@ kern_jail_get(struct thread *td, struct uio *optuio, int flags) optuio->uio_iov[errmsg_pos].iov_base, errmsg_len); else - copyout(errmsg, + (void)copyout(errmsg, optuio->uio_iov[errmsg_pos].iov_base, errmsg_len); }