From nobody Tue Dec 26 02:04:31 2023 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 4SzdPX3F4Rz55Kcr; Tue, 26 Dec 2023 02:04:32 +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 4SzdPX10Tdz4KnM; Tue, 26 Dec 2023 02:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556272; 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=q5JZIjcDngDtN1eQx4V0+3VHqodfFgtKPqecF3/JGsk=; b=p/nhzEBI57NkjvuQ8gtZlJ+uXqVAAZGgBs03OzXqRRkvAUxwkR8KZ5EIEeq26LYoijnadL m4XBfKfNs3gNONodjttIpaW9y5IMNQQbl4c5mmiIScY9NqZ+59Xfb0y+ds7G0pKmEixJEd s9qEtaaf0xu539UCJ+j4RosBzqKyfbWOfzivfC++Mup6GUEZzCYY0Dv1xdHtWQtnvv+rAp L3s4YtLJoM5bTlJRQcRlmcwJKqBB7FGfUOcQoSJ4g4a1rzjA+k5eFhtHA0dSqpqRvF6Oqy cNt9fktqDEsB7W4yvfrje0rgzO+dusTUp1NK0GIP22MZPKXuw+H+doC7yIDKOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556272; a=rsa-sha256; cv=none; b=A+nR0LQu6oyzPQI3i86poM4ryjmYtFyAuNHCIl9vuJzEnD4L7+Cqcx9tr4O0tHMWARmBTw Xjvs0iw9mEd75OlTInUzZq5d4YuF+Hans9xE3vS4PcGBPz7QHtM8V7EIrLxUSN1IXeHBrg Vq9BXG6Vjt/T2dMvFqRXBnMbBtATwAm8AxfU5Er6q1xDxP1p5UQs61PBmMedblUVYCGDi7 onC0UvqRTpu3TpOe+9lRNObgQtOU1GDhIVnwhHOSN3gMMPXVot+pDyTLgfvDi7jEiKv5lW OsSXeBXUR5woXmtlQBsIJS3dN6imOOK8xdtA9QbtTRk2VX75gmzz2Mtv32WL0w== 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=1703556272; 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=q5JZIjcDngDtN1eQx4V0+3VHqodfFgtKPqecF3/JGsk=; b=gh2BRJ4xzw7jqNkiXYMGe9X5gcjEqCmIy2EMv+muIAqrLMHYiMvku+jjRbAKL8Pp/IGLG8 oT1rfekjrWgZCsJxBRcmjXj5auo5vtM9+6eKW7r6Y0PBtARTTvlcfOg7Iz8iUihtZ3Cm72 fIOmRPzh+Hpf9eIO4XjLgx1/v2go+jMKN3V05OYe4oxaEQZmOVpjBoc2J0MMVP6/SDpZAn 4h7xdLyWE5deSsPjMMnE2OkDLCqjaPUtB8r/ylzhdujKl1x8Of46+ymDKSAApk261FcqW6 ffWd1ntVvJdpYNMRMytIKyVrSP1Lq3DN3x0GU8U1IXxR61QjOpWWPOHjdg9AvA== 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 4SzdPX04RlzbW8; Tue, 26 Dec 2023 02:04: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 3BQ24Vl7003556; Tue, 26 Dec 2023 02:04:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24VXq003553; Tue, 26 Dec 2023 02:04:31 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:31 GMT Message-Id: <202312260204.3BQ24VXq003553@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: bbf221e3e822 - main - geom: Report copyout() errors in g_ctl_ioctl_ctl() 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/main X-Git-Reftype: branch X-Git-Commit: bbf221e3e822d15dafb37bd8e200a9864f2636b4 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bbf221e3e822d15dafb37bd8e200a9864f2636b4 commit bbf221e3e822d15dafb37bd8e200a9864f2636b4 Author: Mark Johnston AuthorDate: 2023-12-26 01:43:06 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 geom: Report copyout() errors in g_ctl_ioctl_ctl() Despite the name, req->serror is used in some cases to copy non-error messages to userspace. So, report errors when copying out so long as they don't clobber an earlier error. Reviewed by: mav, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43146 --- sys/geom/geom_ctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c index ebfde5697eeb..5536bd6b7110 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -616,8 +616,10 @@ g_ctl_ioctl_ctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct th } } if (sbuf_done(req->serror)) { - copyout(sbuf_data(req->serror), req->error, + nerror = copyout(sbuf_data(req->serror), req->error, imin(req->lerror, sbuf_len(req->serror) + 1)); + if (nerror != 0 && req->nerror == 0) + req->nerror = nerror; } nerror = req->nerror;