From nobody Sat Nov 14 16:25:01 2026 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 4jRfbx5Hd4z71LxD for ; Sat, 14 Nov 2026 16:25:01 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jRfbx3p4Cz4fBF for ; Sat, 14 Nov 2026 16:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794673501; 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=UmfMRtgw+nUQaE1fAcpavX+xiqFgzZDBOzAntjUq/nk=; b=PDr52I1Q4ynpBEoBDM8UvIjMZ+zL2RVuybwWQfZrOVCopRpaKTb9jCdAg5pZPGDL0h0pQ3 aHqmJTw7RoopfyFLFgFnQcf8DtHdo+b5GRyqZt+ECa0dhnXVSDor9EUD2F+EjuV0xEk00D 3P1tvvoOu+4bPGh8qc133T3hhV+qlbNQ2cYJtUmwx8y20W6/YqVBdREZg/WXc04jY55+fp fYKDyW5TNMI2721fwfbPH25rlTF4pYP5zOQ81rHxcHFneL3eZ+R3GYMbFzVTW5xT4bbbZp 9y50VPtqeZ03QufndxGkY9Un7YtE7AXP/F+IG0iXAXy1+tm3SLpaucIiwWZSPw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794673501; b=CbCMlgZIqNlcgpKWAlhaxlf15GdrecLxwOdgaxzLbxk5SraUeAjYYIEUr/Me1ZGHd8F/dH uEL/a+nEdhP+6asqk+XhLb/zbhXfrv9b4tGrTrutmPjRDmQVuEVdpHfIDto4jtZoyHUwD6 mk2+TcpDMqFz65uWl50GzXK9GsGwUE6fchKfARptejesAFhCDcWCfDHRoZlYQtazXA/zTL aQIj1cEcRuBRCkA2o5vhe1Hi7szG8omAsm39/t+d+kdReBt0aDJqIWby49dHe5k3SUQuif oZU6oE98TRLbAwj11lk9qu8W7jQcTUinmYJ7yDJ/zobEf2lbLGcvpBCxaEwvww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794673501; 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=UmfMRtgw+nUQaE1fAcpavX+xiqFgzZDBOzAntjUq/nk=; b=MBhL52LKzLHryj0JctYtqm7bYgiQ7vEOcq0WVArt0IJIWTXbAWBY2y9HUeg3NtAtnQZ3Dj lCf5FR5d5FXKkZCEqo+nX9Eus7gSU+uueMSGSi2JX2F5GcumxAOhpkuB3Jho6nXocBXI+S yfhCTQwXL1Yo2DN061KA9cukZcAI2G0SpNE+bMwayP40xAmB/S7P7+Z9BEiS8jwG58C3Fh iJoP+/1rKFVqfIX10l7ATe5TfSgXlsuuprPHuj+28M2VD2j2YjQTTVBwbZJbYX7cQY7mjd 0eaQzl6tKPbG2yVooBoLV052rdZEAHeDa4Gv18qOqa1Ij8PfbAECIbAF/p/z2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jRfbx2sQNzRyZ for ; Sat, 14 Nov 2026 16:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 17726 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Nov 2026 16:25:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 1e9e198b7f06 - main - libgeom: Open the control device read-write List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e9e198b7f064322687746d26b283c3fcbad4579 Auto-Submitted: auto-generated Date: Sat, 14 Nov 2026 16:25:01 +0000 Message-Id: <6af88b5d.17726.5cc6e871@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1e9e198b7f064322687746d26b283c3fcbad4579 commit 1e9e198b7f064322687746d26b283c3fcbad4579 Author: Dag-Erling Smørgrav AuthorDate: 2026-11-14 16:24:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-14 16:24:40 +0000 libgeom: Open the control device read-write Try to open the control device read-write first, and fall back to read-only if that fails and the error is EACCES. This prepares us for a future in which GEOM requires write access to execute verbs that modify the configuration. MFC after: 1 week Event: EuroBSDCon 2026 DevSummit Reviewed by: imp, markj, emaste Differential Revision: https://reviews.freebsd.org/D59592 --- lib/libgeom/geom_ctl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libgeom/geom_ctl.c b/lib/libgeom/geom_ctl.c index 8cc4c5b0c4b2..45a8d19661ff 100644 --- a/lib/libgeom/geom_ctl.c +++ b/lib/libgeom/geom_ctl.c @@ -207,15 +207,17 @@ gctl_issue(struct gctl_req *req) return (req->error); } req->lerror--; - fd = open(_PATH_DEV PATH_GEOM_CTL, O_RDONLY); + fd = open(_PATH_DEV PATH_GEOM_CTL, O_RDWR); + if (fd < 0 && errno == EACCES) + fd = open(_PATH_DEV PATH_GEOM_CTL, O_RDONLY); if (fd < 0) - return(strerror(errno)); + return (strerror(errno)); req->nerror = ioctl(fd, GEOM_CTL, req); close(fd); if (req->error[0] != '\0') return (req->error); if (req->nerror == -1) - return(strerror(errno)); + return (strerror(errno)); return (NULL); }