From nobody Mon Dec 5 17:23:26 2022 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 4NQr3z12rYz4kD08; Mon, 5 Dec 2022 17:23:27 +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 4NQr3z0PGXz4DKN; Mon, 5 Dec 2022 17:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670261007; 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=2wklS1avTya8zyVChM+Re5ZXVD1qOCws0xlDlsbbyuw=; b=kwK5HHstuk4JlJ5s6jsuBAQ7NX/74pUaPI54a47IsZpLvAWcMk1StaDECt816jdA3LBklU gRsoXb3pHDJ738oJcJ6v4epMoE+Kt113mMcA7xSG3AmwJjLwAThnNathAOyFTmaUEcpwZx igqUjbsQf1Ka/zrWXXNZGzAzww2RWkvfkdGRo+TmuDirRE9iNGJXNGi2oRh5I0cbYNaxze hiuUQ0rZpYqzKKvUw2LiKnu8pdXlhnTZ7TgXTYcTHO9FMFkQ2ygRH+68NmKIv/mCej12Zt naijSXuZ5SQUAB59zHT1ihKHNndr22GDqLPGGvj/gV3F89wjTD3NCq+wQpHSfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670261007; 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=2wklS1avTya8zyVChM+Re5ZXVD1qOCws0xlDlsbbyuw=; b=FxIBnaGaqiZ3Ipktpyzn3BN/2jKxT3Dm9uZWSY7LaUtb1nsPP8szqEcHQDACsLXBSAbvBv n6YkaaiFiEyeBjnSKYHPnxMvURtBqBiW2xGdvCGgKVJtl8Hg1aWxx97zdczuFShZ5ZgmjL IzHlC1yv5VEKT0iUO5+7AZYiEmhWY+/D8cOAWBOJ1S2QEA/r652ZfUlqj6v7n6y89QaZnC OtIKts8AzG6nZ08gGVatoM28BTl67DWzT93v3hFV5pM1LnQXGrjUksG66ppL2Dbxp7L26l OAUsuXjRRXGewLtBC0ZfBM6hz4WGqo6+J/QMLCJ4j7qxrbt0iBsql5uTz7mlUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670261007; a=rsa-sha256; cv=none; b=CuvSb8vdqNOrwRJNiEN7vBFlROrWTi2G9mCmwCcxFwy+21Hdrnu1FnM2RVb9eB/MrYjFBX KsU3+yOiiY8ZhtaVHVDv0o4jEIUfIw9q7K7HUzia4QFb9zEWF2+cztgiIKuWM3VToMWi9J w6If8M2sP+GapG5oXW+Vd9GjE/DPlIxm35GHOVddIwREpdqPZ3fsQSvITXi/rwvVOLmxG9 MGaYClExnz+s/E0WR72hljkz+SnDRGRLv2r4Aosl9PE3NS5ufS0enCUR9GMsWHxICfXZqX YTgs9c1J/Jn044CKEDMvPae0rgZ1LyXU6aR0fpYG1axf/zguwKiT9o3G0PXOEQ== 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 4NQr3y6Vzzz15Tf; Mon, 5 Dec 2022 17:23:26 +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 2B5HNQVa011959; Mon, 5 Dec 2022 17:23:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5HNQRP011958; Mon, 5 Dec 2022 17:23:26 GMT (envelope-from git) Date: Mon, 5 Dec 2022 17:23:26 GMT Message-Id: <202212051723.2B5HNQRP011958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 5a023bd2a53a - main - bhyveload: open guest boot disk image O_RDWR 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: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a023bd2a53a7279b126ae6bf949560c6342b57a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=5a023bd2a53a7279b126ae6bf949560c6342b57a commit 5a023bd2a53a7279b126ae6bf949560c6342b57a Author: Robert Wing AuthorDate: 2022-12-05 17:22:45 +0000 Commit: Robert Wing CommitDate: 2022-12-05 17:22:45 +0000 bhyveload: open guest boot disk image O_RDWR When a boot environment has been booted via the bootonce feature, userboot clears the bootonce value from an nvlist but fails to write the updated nvlist back to disk. The failure occurs because bhyveload opens the guest boot disk image O_RDONLY, fix this by opening it O_RDWR. Reviewed by: imp, markj, jhb Differential Revision: https://reviews.freebsd.org/D37274 --- usr.sbin/bhyveload/bhyveload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index db7d995f2466..1a24b5f0044a 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -690,7 +690,7 @@ disk_open(char *path) if (ndisks >= NDISKS) return (ERANGE); - fd = open(path, O_RDONLY); + fd = open(path, O_RDWR); if (fd < 0) return (errno);