From nobody Tue Jan 02 01:13:14 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 4T3vx64gYpz5635Y; Tue, 2 Jan 2024 01:13:14 +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 4T3vx62tLYz3b6t; Tue, 2 Jan 2024 01:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704157994; 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=xRfR7ku6LcsIj0hriTJbvA9phipDByCz4UOgxizb8kQ=; b=xa8AGtHwfAeUICOQNkbWlY3F0Xze7rlAlY/fIz5Hx2efaP0hBIjbrcgs0tUiDg4hXVcS8T FDG0cpZvWewhi9qsiweyI7S7JYf2KSPxFSuByGVc0sSUVA2PTr2fDMENOPMdgAh1TjisRP siN+4fFGd9CVbwzvyNSscioXjAhUTSfZsfHfK325SJT35J6QdJV7zLACOnze57qGO5S4OW pbj/xcZUsx3IhIe9ytXuj4cvVJtF9cjVV5W1+SbhDgmmyBiThTdAmcvDLwBoP18LGW3hn4 xSr1tK3t6ZgiZdEwVxYDv3r5dp30Q4XNVp1JjNBnoo5wrXGoFU65Vkvvz3Yo4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704157994; a=rsa-sha256; cv=none; b=q4X8xBBV1wEGR68KAw0e4Fra25DwaKDZ4UkYFAKeI/D9Csf9vQ/iO6ADTK0oDtL7LEhuys gsFW7Y+2xuHS9UTiqWKpiW30Staccbdnpn2yfk9yNzyrJnM11ypbtpL/Hj6LZvQpAnGeiM CB74FRXsWXSNPEhjV+dOc/vHgFMOoKozBbWhnUdQdXBQ+4fbvL3g9lYtu9pntGlGBQp6kS t/l4IKAKYfAFQ8tWRIWrSejAnRlx8wrd5MD1oed7xeC0m1hz1Pn2mdEPDzfHp4pSCZbdwC 61HXS35L/hqzEQ4lO0GJXuHqYQ4iMNN+Jdo1iJSJZ7syGqQmt20z9HwaudeVwA== 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=1704157994; 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=xRfR7ku6LcsIj0hriTJbvA9phipDByCz4UOgxizb8kQ=; b=yZT/fugAQ9yXeckruwRY7bU9d5wnc5bwj0yJud2Fx6MJsgK1c5MiG5/fPKmj5EtWLvc/oh UGOAI3FM+E+u3F3Sfj5zBpFIjM2N9tdLZySP/nNU4KWhJ2umVEfduvMLn7iXM8bgvx7XN0 vp7TbRtbCPAbYE4Yq9cHA3qLsuCBKLcQQyoszrfCBlBdlkHZUlWECmrZfmeRVBKAZdM5Sc Dt7e7dfJeoUsndfIJGThSPUO1rkDFeC+D28vmirQeOAhtENWcRTXClpuA/xYwwtdXBiam+ haZ7yWO6QR7QnC1TffOz2/PXYjiSVF2un6whETD28cvAJ+iYdKoRI4Njg97ZQA== 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 4T3vx61zpNzgc4; Tue, 2 Jan 2024 01:13:14 +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 4021DE25055446; Tue, 2 Jan 2024 01:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4021DEhh055443; Tue, 2 Jan 2024 01:13:14 GMT (envelope-from git) Date: Tue, 2 Jan 2024 01:13:14 GMT Message-Id: <202401020113.4021DEhh055443@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: 96df9d0478ab - stable/13 - nmount: Ignore errors when copying out an 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/13 X-Git-Reftype: branch X-Git-Commit: 96df9d0478ab642ba4ee8d89b4c2bef6328aa74c Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=96df9d0478ab642ba4ee8d89b4c2bef6328aa74c commit 96df9d0478ab642ba4ee8d89b4c2bef6328aa74c Author: Mark Johnston AuthorDate: 2023-12-26 01:43:21 +0000 Commit: Mark Johnston CommitDate: 2024-01-02 01:12:45 +0000 nmount: Ignore errors when copying out an error string In general we copy error strings as part of reporting an error from lower layers, so if the copyout() fails there's nothing to do since we'd prefer to preserve the original error. This is in preparation for annotating copyin() and related functions with __result_use_check. Reviewed by: olce, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43147 (cherry picked from commit 099d25c354d93d9cd9c9cd261428f5ab0547a194) --- sys/kern/vfs_mount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 8ad5b34c729d..756ac4789c8c 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -882,7 +882,7 @@ bail: fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); } else { - copyout(errmsg, + (void)copyout(errmsg, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); }