From nobody Fri Jul 29 18:12:10 2022 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 4LvbFl0vTQz4Xw6N; Fri, 29 Jul 2022 18:12:11 +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 4LvbFl0WPKz3jZR; Fri, 29 Jul 2022 18:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659118331; 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=jPQ4c2FAzYHXL8LKK7F2fo9tnulr8VbLzrFwLwxUfmg=; b=od0a7Q6Ba9dFXZbcxaxYCqfZHugUMGj4q2R+Hh14aTBy3viUwo8Zw/cRKyiRxjbCR3eOUb AKH0QRsfBXjtRQw/GD6SNVT//1hQL8bphIfyOBAOfXLEM7m8bKPizd22XEfur2KDSgeJWQ mKkIizd6597gLVNWIQWZU5WdQm8bjg6EqR3t7QI1rVlH9td9emCjWXxvnbJc0uEMjtJ3mM f7aAQLeG+Wpt+Lm+CXKgNyR2+0NTJQY2RTS1V8LAqsWkmLUzLuX8R/tmlPDmCkmsC0Q2M3 MVRYssGRk28HEnSI/A9TRtcn+enu836Sy7zObYpVdTVvrciqRvMZ6HCrqHAlLg== 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 4LvbFk6hN7zlPr; Fri, 29 Jul 2022 18:12:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26TICArn082260; Fri, 29 Jul 2022 18:12:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TICALm082259; Fri, 29 Jul 2022 18:12:10 GMT (envelope-from git) Date: Fri, 29 Jul 2022 18:12:10 GMT Message-Id: <202207291812.26TICALm082259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 58cb3626762d - main - Fix for 90e2971 that caused some geli commands to return the wrong exit status. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58cb3626762d8ec9c499a664223190648479fc5a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659118331; 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=jPQ4c2FAzYHXL8LKK7F2fo9tnulr8VbLzrFwLwxUfmg=; b=mDKND2EyKwPv1Vtwans0t+itocoyLQP+kIqawdm5hjPI5AVmuMpmB/Qw/iqNYDerxeooBQ l6jEhGwYm8Bij54eVB2q2dQEoTEWxbkIcEZsy8OQsxDDW55VHNG1X0R1wiO/tXzFbkJp3a IIWOzZ2J/8nKhd20FPiAhabLJ4gThgRvdK9gTdxUMM15pN8+kFKJ+7cmxoTd9qb7EPYHvN /rWsx6Tf6fn3ixj2UmrjTEJcCLZEnOfp++BYcWMnwU9c9qnzGkovQxHTT74VfeP94SnxxK Oxubt93JvqFYDYmjpgWu1NmHft8EZ9C/IgozWzaafTuMXxz1JWHcA0K8AOaMGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659118331; a=rsa-sha256; cv=none; b=M/fj2mZzVwgTJ1pbvWmy0qxpCTEcvA9jVbzIPmTx+V36caruZG+VF9loFo21yFFkOP7eHc FQQEIwXXMEgEnTYaJA+SiSKDhMhiBmkiquWC9GIhm3WUNCmZOLY8KPo0ftqsqnLWGhAwrS iu8yJhd3GzP/3btfTg6eXAAZUtVjYr+SimMurChzkJ21Y0gZQ/cXoM1gs9KJTua2jy5IpV rFPHzijWTqHAmsUiQFYr8nbXUI3J5dXsOh4qzscfvUYZsmgBuw6vySBOQYo/K6onYGym1h uzF+2ScbIu9qJGic3IHwdyOImXANG2t535UN20QZN1SVyf5aNvabb1D0kir9Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=58cb3626762d8ec9c499a664223190648479fc5a commit 58cb3626762d8ec9c499a664223190648479fc5a Author: Kirk McKusick AuthorDate: 2022-07-29 18:11:09 +0000 Commit: Kirk McKusick CommitDate: 2022-07-29 18:11:46 +0000 Fix for 90e2971 that caused some geli commands to return the wrong exit status. The reported problem is that some geli commands exit with a success status when they should exit with a failed status. The gctl_error() function is defined differently in the kernel (in sys/geom/geom_ctl.c) versus in the geom user facilities (in sbin/geom/misc/subr.c). In the kernel, calling gctl_error() causes an error return to be set while in the user version it does not. It was only by a quirk that had been added to the user geom return processing that I "cleaned up" that the lack of the user implementaion to set the error return showed up. This patch adds the missing setting of the error code when calling the user facility gctl_error(). Reported by: Jenkins Debugging by: Alan Somers Debugging by: Cy Schubert Debugging by: Li-Wen Hsu --- sbin/geom/misc/subr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/geom/misc/subr.c b/sbin/geom/misc/subr.c index 3985ae56edc6..297a1cc09a36 100644 --- a/sbin/geom/misc/subr.c +++ b/sbin/geom/misc/subr.c @@ -398,6 +398,8 @@ gctl_error(struct gctl_req *req, const char *error, ...) fprintf(stderr, "\n"); } va_end(ap); + if (req != NULL && req->nerror == 0) + req->nerror = EINVAL; } static void *