From nobody Tue Dec 26 02:04:36 2023 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 4SzdPd0pKqz55Kpp; Tue, 26 Dec 2023 02:04:37 +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 4SzdPc5TzBz4KpR; Tue, 26 Dec 2023 02:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556276; 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=EFoaJ4l35vkLex3RMYZ1LTfB7ATHSDZL50ZjfJqcLhU=; b=V9wl/klkqbtxOq5ZJzRNkdh1MoA5oGjNciXoUtOFtAp+o/y/WQJIZVg8vVTZmjPefDym07 7uUOVFCYnWzc8XOjLmuqap0HiaTxUhqy8/m8iyZsit18HwzSBF21ID3IYHK2WJ7hAtHU8S e5KyaTm/6PNBA4A98p14bhIMlVee9TkGfKthuP43Tma5R5FgoZuJWtf++K3JDc/wKWZu7o pxyBzR5wsN7+plnhvdznrrsCHzeVJUPTvTtDC4zKvWOAI6klB4gix+tJlKhNQQ5oPzu04A zUoQXgzBoadk2RxU7MTP8DMKCx8GejM2AopeEJkUyEZwNn+WD4IJefe7vs6WFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556276; a=rsa-sha256; cv=none; b=Y68wk15W1vEiwnspeey54cibG/lH4F36k+eh3oDvB7V5te3qcY1MBu2a2tWwae7fGobptL mPnqV8zA0Pf75PwPjyfkZ/ir2VYyp5tHg7hEmGOKkOBngw8KR/L48dQGdYLWgSb3MWr8Aw wIOuUNWVkoT2aGMfn5LWpqoq6llMX/WKrECdAOH79v4JXG6p/Fh5ChjxJGlRVcDq/0rNlg f7CpTOg6ZLA+kgrR90u8zUosxMiwRPnbEmeP2n/TgFWJMGHWL724hRjr+3yy0SRVRjJUw1 RFRUsTLYpIJ5qmLDSKxRKJ1b0Cg1qg+9b27qaqYY8Wjl6+I0fX3QVYru79uDEQ== 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=1703556276; 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=EFoaJ4l35vkLex3RMYZ1LTfB7ATHSDZL50ZjfJqcLhU=; b=tMG1qFi/cm47trw20T07O+V/iS1OE47kpnmNOz2fvFlknJihN11UqaFTR16WzLp4zCaH48 QEy1kaALlxJercob4EhHTskrXDKX1nOvXiytpl32WVvBoJ8eGqxDN9rAFtUUHyhUaFXElR lWDlKYxtkNxRTNWb/KNX9mAUa9xw6HQpVU7JHsmH0abAPjzGgRf8X8fFYeK+nPoV0fapyf eBPhpSvQks5hiDfwnnv91RgquUrhfaL/gXr6/ypXmchujZP93sMTjAMkBxJ2CZ8eepjp8r H5xRDCAbHA/Oc599syCFuq/afbsQDP4bUu+S/fKa9FUtBY+DHccFfznTd4hfiw== 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 4SzdPc4bR6zbvB; Tue, 26 Dec 2023 02:04:36 +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 3BQ24aG4003765; Tue, 26 Dec 2023 02:04:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ24aFH003762; Tue, 26 Dec 2023 02:04:36 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:04:36 GMT Message-Id: <202312260204.3BQ24aFH003762@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: 6adf554abd1c - main - vmm: Fix handling of errors from subyte() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6adf554abd1c848d2c9ab7ea8a7fb7dd20a0c186 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6adf554abd1c848d2c9ab7ea8a7fb7dd20a0c186 commit 6adf554abd1c848d2c9ab7ea8a7fb7dd20a0c186 Author: Mark Johnston AuthorDate: 2023-12-26 01:43:51 +0000 Commit: Mark Johnston CommitDate: 2023-12-26 02:04:01 +0000 vmm: Fix handling of errors from subyte() subyte() returns -1 upon an error, not an errno value. MFC after: 1 week Fixes: e17eca327633 ("vmm: Avoid embedding cpuset_t ioctl ABIs") --- sys/amd64/vmm/vmm_dev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index cae15d7059cb..5214cd3f1447 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -629,10 +629,12 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, p = (uint8_t *)vmrun->cpuset + sizeof(cpuset_t); - while (error == 0 && - p < (uint8_t *)vmrun->cpuset + + while (p < (uint8_t *)vmrun->cpuset + vmrun->cpusetsize) { - error = subyte(p++, 0); + if (subyte(p++, 0) != 0) { + error = EFAULT; + break; + } } } }