From nobody Tue Jan 02 00:37:32 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 4T3v7x11m7z55ydf; Tue, 2 Jan 2024 00:37:33 +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 4T3v7x0Q8Fz3J89; Tue, 2 Jan 2024 00:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704155853; 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=61Fgsv/QKGEU5RJDO69shuJVn6hKe0lg/2c61y3EVOg=; b=lJl7rLuQ3fKO7Q8ag7fC7mULBSqoMB7e6EGUROlMc4kwEhfr6z/k019wMsI/9kzbEwq4Jd zL74JJOhImye+po0i1uS+2ys0WDZNL5zIPsFeX6NEf4LVAjrRcDf9jwBSevEbJn/cy+W49 kKb+qwMx05oIWcmiezANE1XaGQDKxvoop3lcVHZ0NGTlKcLO9zuU1KjN4PjOqbOpcMRA2O OeGFng7D/Faaf4KiYVJIWILtx3QGDw6QSe/hUes7WO9pPJPFozeTa8+yeGnxvdMsmq/E+K Dqqe2svrpPTzgtEiOPT/KtoIu85Y1av0ewaQBoFOvee7tCPEDE0I1oCn+D+vlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704155853; a=rsa-sha256; cv=none; b=GHzQrdBxNHYqOgneJrvdDojgZ/NeDKRF+IJlYdTj8wDFueYuLbQiVRtmo9CiFKoQpfrkhU MjToVqUPdRINO2cWIgbOxIk6zeQ2/c3D03n4TTN8rcaeG0cnDqsC+dZQXEtA5BkTPKf5Iw HDrOO5Gu6UB2+UpwATxep5vsy1SN7uhdRGxEj0WHb33/9eQ0zwELNlAllLSSfKyx4ygUUO QYhKe7TDvymSC2as5iFB5KpqhY2V/hmkd+/WYOQC3a5HVPRplLgIgdejeqjsFJ6e5vYWDp VIgFGGOuxoMWu0+O7rjvRf5bIaCosmRDAyz+YTgquqEywatJNIG+by45zV7fBg== 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=1704155853; 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=61Fgsv/QKGEU5RJDO69shuJVn6hKe0lg/2c61y3EVOg=; b=mTE+/2DhQmfsZxzAICbHTJL9n8jy7xP573FKvy3pok5LBSm9D0p7kqMoCoZMB6LaLE7oOC aNogTCWLWHZ0AK/YRfZXTuUN/lf1pOuTrfgPhzgwfaoPcyEozkli4gbv1vtWP6MhZW1hmm Y1nGzPaJkZ8aDPbyEau2DeSUnlU8odgpRBjyX90/OOF1MBaI77s5AOYlTUcNFzhn6a3rtX OkFhIu8lxytwjdNinQiYklhQn9qATd/vLcmXf0i5efyp2s9U1+O/pAiN/cnKPkQeynKDo1 wvWK/oYP7M7Tol2NzV1gjQqJxCoyOvLuDP5oFPlBJHn2Dhy88FmDj+VjdmFmxA== 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 4T3v7w6bgtzfqY; Tue, 2 Jan 2024 00:37:32 +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 4020bWN3085845; Tue, 2 Jan 2024 00:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4020bWWi085842; Tue, 2 Jan 2024 00:37:32 GMT (envelope-from git) Date: Tue, 2 Jan 2024 00:37:32 GMT Message-Id: <202401020037.4020bWWi085842@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: 7bc713a5a5cf - stable/14 - nmount: Ignore errors when copying out an 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/14 X-Git-Reftype: branch X-Git-Commit: 7bc713a5a5cf27140ad86a2ac805e9c0ea9bd083 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7bc713a5a5cf27140ad86a2ac805e9c0ea9bd083 commit 7bc713a5a5cf27140ad86a2ac805e9c0ea9bd083 Author: Mark Johnston AuthorDate: 2023-12-26 01:43:21 +0000 Commit: Mark Johnston CommitDate: 2024-01-02 00:29:58 +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 79a23b058add..c42fcfa7537b 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1025,7 +1025,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); }