From nobody Tue Dec 26 02:04:33 2023 X-Original-To: dev-commits-src-main@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 4SzdPZ1FgSz55Kr8; Tue, 26 Dec 2023 02:04:34 +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 4SzdPY3zqnz4Ksq; Tue, 26 Dec 2023 02:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556273; 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=GTaLbpLKHBWyWeGBaHVj6GOZ7POEkV+jUe7xS7kTB4I=; b=hiDI9Ha5PuNEbhZJRvOu3qA5wTm9fYNbwgQOCf3UVNP4Fj+07gvp2on9a43EZ7bmg1SAwY 2VkE9taTNJVCxrrlitHDrpaA7uSPOrSp/UzMOSqnaBDmsq2i0p1C/co7ffXLtwO7buVRj4 MM52pFpW2gHXAFhLaQO7WDdOzDZ/fHaFjf1Luasb424+6gP2ORqrZ1Ngajv0mKaXL0f0AX cQPAakAIN5nZIMzXRvFmm7ERllt6I3RNYicZFXw/8magMKt/DjkK2V98/vsfZO1ffdvnB/ GZI7nIxaKTNqpJ3bfgzXJ4QOhlzREFsOHjYZ1dTc05Dzsd3zcUc5dXoETT5xKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556273; a=rsa-sha256; cv=none; b=KAU8JCP86fT1ujqT8nuHL7U6s1MlHNHun+aawQzklyRCERuJDkPmuWjGVC2mdozlfNPTSe ojXa7HIKrNRzEia94HRGYtUlGM/pIN+44Ie8MbmCsWNEogrVBQPnXPGECTyih+Hw9ZhOvQ 3/IOzGp/eg/N8bh2NZjFUvmDz/+olVfHRuexCgb6WLGvfxIbjg35wL5phVx2RrcgjBg1pJ eE8NRdRdlRFp3gieGVGvPDu/Gp55WXwdgphX9TbR5kEB23FVOIfQIl/J1/9WTRllVQyoLM p/B/mEq7kRIUQHkRGMgEEY5d+sItR6d/sSBdOFaChCl0bljZZOp/EWyUa7aCqg== 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=1703556273; 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=GTaLbpLKHBWyWeGBaHVj6GOZ7POEkV+jUe7xS7kTB4I=; b=eBIGbxdQ7H8NYaDnlC9QzFJ1Px5RPvUDCT8BulICRFr0DbKJQTK5Xwu8koo/8THlVyscdB wG0LpmB+DmPj1IUcqcasCz8/6ppsC72OPsa4/cIUdkkQErY+HgLn8DJzfrzYeLso2KnWvg JOwh8Hv+AxMTZWROLzwqqjUSMBq3cqkM5zt9pU/Tt2m9Q/aAAW7qgf54heKFQZ4t7ZHKw0 bnrFx4eNGjBA1UlvTyGDa0oON5ZqQ1ZyzicuI2dixIH6HtL3AHY9drddHzX2zwjDOv1NsG XkS3h2RjFy7bQKbgCLsSUXDc8KhWGzyigw9I/1Iufm8yZFV5wSCFkKjfGHPV1w== 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 4SzdPY1Ft5zbv9; Tue, 26 Dec 2023 02:04:33 +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 3BQ24Xw9003610; Tue, 26 Dec 2023 02:04:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24X2g003607; Tue, 26 Dec 2023 02:04:33 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:33 GMT Message-Id: <202312260204.3BQ24X2g003607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 099d25c354d9 - main - nmount: Ignore errors when copying out an error string List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 099d25c354d93d9cd9c9cd261428f5ab0547a194 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=099d25c354d93d9cd9c9cd261428f5ab0547a194 commit 099d25c354d93d9cd9c9cd261428f5ab0547a194 Author: Mark Johnston AuthorDate: 2023-12-26 01:43:21 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +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 --- 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 331e4887c200..347ec7f70aaf 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1024,7 +1024,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); }