From nobody Tue Jan 02 00:37:31 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 4T3v7w0Rs4z55ymC; Tue, 2 Jan 2024 00:37: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 4T3v7v6R0Lz3J3n; Tue, 2 Jan 2024 00:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704155851; 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=uIVlttnGz6TXuHY8kbHUxLx1vrR0OZchzuPjX3Cqzzw=; b=gJeXUUNg2n4RMaoHM4qwWHn1L0RjLxreI7By5ZR37Yw/G6eh7Ks/xWkNjbDqFJg8HHlnnF PFmqwUekRm8NrGtLoR5AqJFc5x6w3MrarysqnT+RVHjzRnJPLrNj0cOynLVEyWwxfAd+Fx SbTSVI3Eo04Ghsssok35yA+RtNi7/J4X6QcGfevDnPp6f41xvMgUsFxBDtUiPYXOhdYlxh RQc2jCFdh+rOw1oGqPNj77R7HwWjO2SBJa5ckZhC2RbcC4BqPvjgSnQXNBA7siAcFIkXSk 2egb307PX5eBmkq3wZF3XpW0lfQrBTDLvrcVEroQwgt3oEUhDP0jBrM2yuBESg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704155851; a=rsa-sha256; cv=none; b=iBgXw/OSx2PHuSTSr4cGT5DiWwhkk45NJ/6M/rlaQcGsCj8tJMyvK8JBi04wkEk6FmoLS/ ZdOWrB0ZDbR6Yrwfq2LG36vF20/zd0VPB2f/pvKDdkyxGf+7irbzRS/ACIbdP4HCgLWJAo geOKRCTZzPaW9h96xAL5RngJ4WxoBTADcXYkV7+Aubf9B+1t10uK0mRzFCFzMzozxJHUHn F52zSoiXwbdugJepu0RwiATp9G1w5DH7ExaYCIXSokAhQ/KNrjbptRhnU5WxtvGLGD0K4D X+PDi9Fms+hx1ot05cgqw06qZqmczeIoQIpD2mmn9HwZhlbKlJmQ86uONHiAYw== 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=1704155851; 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=uIVlttnGz6TXuHY8kbHUxLx1vrR0OZchzuPjX3Cqzzw=; b=JY41k+JuCv3xOHFz8tnk2Q/XsVdeUI185FYALEPzZLo52M5NTlVp9E5NfYzYgrfgow8eWY 9Js3AuwpczheT0or20XamQqj4yoJSQ3IfmOhlMxQnA9Az4LQL/EGETsnGTPrc9BvH+gc18 5OAhv1WWiYmnMAYlotunWmm840iKSoputV7B5+28AtTM/QZbS3V8pS9g9zNnszkJS9g98K QF4AuNM990vHirhTD/6UGgnwQdjxwn0269zEAfCnj6V2fnmTsko07t011mORnVjFAnIC3B k/lOnQQ8FNZwkhk0SKP13R8IZjiZLrHAM/HE6+Y42ZaVIUm9LR3LNWTbEYOw4Q== 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 4T3v7v5XpNzfbD; Tue, 2 Jan 2024 00:37:31 +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 4020bVN7085791; Tue, 2 Jan 2024 00:37:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4020bVcG085788; Tue, 2 Jan 2024 00:37:31 GMT (envelope-from git) Date: Tue, 2 Jan 2024 00:37:31 GMT Message-Id: <202401020037.4020bVcG085788@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: bd287fa8bcac - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: bd287fa8bcac0d985d503c01d581c85ffb6d25ee Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bd287fa8bcac0d985d503c01d581c85ffb6d25ee commit bd287fa8bcac0d985d503c01d581c85ffb6d25ee Author: Mark Johnston AuthorDate: 2023-12-26 01:43:06 +0000 Commit: Mark Johnston CommitDate: 2024-01-02 00:29:57 +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 (cherry picked from commit bbf221e3e822d15dafb37bd8e200a9864f2636b4) --- 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 b7c80c77d4ba..f075488a832c 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -617,8 +617,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;