From nobody Tue Jan 02 01:13:06 2024 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 4T3vwy67zVz56391; Tue, 2 Jan 2024 01:13:06 +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 4T3vwy346gz3bBG; Tue, 2 Jan 2024 01:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704157986; 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=QVBnUYEWBYRecLXXOP+l1kyvu6ZD6XRN0VVvnyjtGE8=; b=sdeRZ29TbvRwo311aM3g/YY9UqmQSEuExyg4oFwi3ujf5ejdFD7FjVB/h0WH+MNHhgJ8EI wimR6obnZiw34In+oPaw2ZU0ShOAH0F1xqRc/LIRVl4MVEoukPAqPgK81RTpVOwmzlv28p vgFju36fsgOtlYVRDNWDtlFqbH1nOabYnIu0BBlqBxoaqVZ+GVQjo+8VgWTQeOX4SeGDHO vpfLmoiwGwXB76JI+IR5GG4YrIQQ4RucgEHBhuk1Vmk7KCZFL+7JgNcg0M8D3jCFhOjrLM ElikhOfPEjZEx9TcSZEVWDJKCWBBfcqe3bA+sbQfQSdKs1Nxu9om+6RcD6TmuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704157986; a=rsa-sha256; cv=none; b=Tvi+J9fFyVQ+0XTtNU02h5cJ+ZriJJJxJINdSsihj8zXCdcVkjTn1wmMDCmBIcsXTs8OdJ l3T96zHq38bwXp1RID5R+DaASoMHH0w+DYcv3fs8Znzx8nNmipjrPMKrgXagPB/ELvOOCP QJ49kwBbYDQYJgavLL67WLqPfTPw6nf+8ekY7RjfNybuR49SKIeFDmsK56kxlsdJf0WxAL rETF91Wut6Co2f4qayTPvHso0sp/78jEoRFh8MSiRRBfBnjPF5hwNpivOXwgJkooJiYfef XJEK+g3+X4Y3Qu2zLKtE2MvAkTVLrnvUtnFac4t/ZFjxkuP29uk2v5r5icg2/Q== 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=1704157986; 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=QVBnUYEWBYRecLXXOP+l1kyvu6ZD6XRN0VVvnyjtGE8=; b=Q/vPeow6mQOPv8eceCqWQy9yE/0Fy4mk5Q9tBuBTHc/0Q0EHcRPbsZIU3PYidwMo34jBnT fnjSiqA9Fsg3NMfbsCjAfbU3yG7eTtpOwtSfZFHcPbWlTwJG6TENfUrd97mgZptUMSOiKA XwnPVYNmPsvCeDpP3A/Lf8i9Hg9zObVijgynmtqZ8xRcW5af27BMW1392dsNf4MVvTH35L wz3HbddNSuE0irId50eyq8OVsW9mnIDjdtrekHSg0fdGin5wL/giXoE/86Ai1TkuOqdrXV Tubi0jEHox2CutkYKUIHU6e/85etRmVIW7VBTgXT1W+mqVnD2VCa6YcxbkApDg== 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 4T3vwy29vdzgg9; Tue, 2 Jan 2024 01:13:06 +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 4021D6ku055088; Tue, 2 Jan 2024 01:13:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4021D61l055085; Tue, 2 Jan 2024 01:13:06 GMT (envelope-from git) Date: Tue, 2 Jan 2024 01:13:06 GMT Message-Id: <202401020113.4021D61l055085@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: 3ca51fac629d - stable/13 - jail: Ignore errors from copyout() while copying the error string 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 3ca51fac629dce5bd02757b2e871cd38fbcb228f Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3ca51fac629dce5bd02757b2e871cd38fbcb228f commit 3ca51fac629dce5bd02757b2e871cd38fbcb228f Author: Mark Johnston AuthorDate: 2023-12-26 01:41:54 +0000 Commit: Mark Johnston CommitDate: 2024-01-02 01:12:45 +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 9a9371f8591d..8b043687a75b 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -1915,7 +1915,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); } @@ -2298,7 +2298,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); }