From nobody Mon Apr 20 15:49:37 2026 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 4fzqgC4SLKz6Wpr2 for ; Mon, 20 Apr 2026 15:49:43 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fzqgC1LR2z3DTJ for ; Mon, 20 Apr 2026 15:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776700183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YjG6yI/f/fTQmcpPAKtsu5kiLrQLFUiGXga2vX5pXaY=; b=SCk4MmqrRlxRz8tvJwXQjkZ8Fyz62WYZKVGVC/6R52zu33voqUk4GLoAoGAKQbJMGt7fC1 U6yat9D20ciaHvmIBUG/GHFtdq84k3qiiWEgMkqbc34kJ0PquDg9awrShMCmvrTuve1EbL PClIU1G4umY/duJbfM5A1Y8Fkclj2BMbwIR//Fn9PLT8cEIvDsnLJhcuIx8sDplFBApunn YKddjoHk4GBd0UkGSqqbQDk+/rI9M4GqwqvJ3Z9cnZEKudexK0xxoolbUuhPFSqwzEDyDo KC5DexkjAnNLuLpyt9eJ6wfvv8cvidlgm4w4Z2RAEcgq8GbddPSoB5+E3/qTpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776700183; a=rsa-sha256; cv=none; b=FEx1rsIADxS4K2YohZiZgaBGpKX8VASi7wRL2A98Wzb810bYrBColNgTx9/jNwKLMq/Vo9 f9Ilp7fIxjF3AhKR7e7QiHccJKEdOmkoLbobNa3MIFohnHI8nw7USoC0r8jS573D6ilQWW DAGe2FnECNbPXA0lO6k+lti14ZpOg4n/KAjRC35ETsip5alnHT1PDzd7W+vcosWKnNqx90 4yk7ku8OMydiJ1b7fWo8UOeCMAQit38f4lJ4IZlis93HH/IWJLoTC4au4EyGEK71pe4mGX VNgvBdU6KqNZkAPbSbYxBDvPZyfAvFLerhxIE+miXHexHP9xOD3d0QxbM3B2kg== 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=1776700183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YjG6yI/f/fTQmcpPAKtsu5kiLrQLFUiGXga2vX5pXaY=; b=LJzbp/xDHBL+0BbQLV0j7C0VehBBAs83uOZUpWMX3jd5SdunZm2G7zsJWNfDJ4tiFwmN+C Z33T+627/Zq+IWaOVcmswcyrUw8PZCzgHfRdGYfvj7KGxU+W7SXWqt/zDFFQcblZd797nQ SrQtkT7MVq/TNihWIBBGWW2FsVrfpVKV1s1Jsz25PZHyoXZRvjb7ZQRvGSKXg3jpnbfKAF npwFb48HNGwOC5oZACc1UNCidq7dEe1uXEz/8WE9ibVQFq9F2706ywYxgYvRKlTFOpoyHZ 5BP+PPn00uzuWNTGbXVf6tj9aTwFkEEOLidbVa+Tj6eeNdiwsLnUBO5G6acLHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fzqgC0cl0z13fl for ; Mon, 20 Apr 2026 15:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32c6e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Apr 2026 15:49:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hans Rosenfeld From: Mark Johnston Subject: git: 91f03cde6604 - main - libvmmapi: Check for allocation failure in vm_vcpu_open() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 91f03cde6604fdb940f30d81e4860118ee07f4b3 Auto-Submitted: auto-generated Date: Mon, 20 Apr 2026 15:49:37 +0000 Message-Id: <69e64b11.32c6e.3addcdea@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=91f03cde6604fdb940f30d81e4860118ee07f4b3 commit 91f03cde6604fdb940f30d81e4860118ee07f4b3 Author: Hans Rosenfeld AuthorDate: 2026-04-20 15:14:16 +0000 Commit: Mark Johnston CommitDate: 2026-04-20 15:14:49 +0000 libvmmapi: Check for allocation failure in vm_vcpu_open() vm_vcpu_open() really should check the value returned from malloc() and return NULL on failure. Also, all users of vm_vcpu_open() need to check the returned value for NULL, too. Reviewed by: corvink, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56346 --- lib/libvmmapi/vmmapi.c | 4 ++++ usr.sbin/bhyve/bhyverun.c | 13 +++++++++++++ usr.sbin/bhyvectl/bhyvectl.c | 7 +++++++ usr.sbin/bhyveload/bhyveload.c | 2 ++ 4 files changed, 26 insertions(+) diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c index ede46dce73b3..99d0a1ec7e39 100644 --- a/lib/libvmmapi/vmmapi.c +++ b/lib/libvmmapi/vmmapi.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 NetApp, Inc. + * Copyright (c) 2026 Hans Rosenfeld * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -218,6 +219,9 @@ vm_vcpu_open(struct vmctx *ctx, int vcpuid) struct vcpu *vcpu; vcpu = malloc(sizeof(*vcpu)); + if (vcpu == NULL) + return (vcpu); + vcpu->ctx = ctx; vcpu->vcpuid = vcpuid; return (vcpu); diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 9db62972467c..994f0f1fef21 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 NetApp, Inc. + * Copyright (c) 2026 Hans Rosenfeld * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -917,6 +918,12 @@ main(int argc, char *argv[]) } bsp = vm_vcpu_open(ctx, BSP); + if (bsp == NULL) { + fprintf(stderr, "Unable to open boot VCPU: %s", + strerror(errno)); + exit(BHYVE_EXIT_ERROR); + } + max_vcpus = num_vcpus_allowed(ctx, bsp); if (guest_ncpus > max_vcpus) { fprintf(stderr, "%d vCPUs requested but only %d available\n", @@ -935,6 +942,12 @@ main(int argc, char *argv[]) vcpu_info[vcpuid].vcpu = bsp; else vcpu_info[vcpuid].vcpu = vm_vcpu_open(ctx, vcpuid); + + if (vcpu_info[vcpuid].vcpu == NULL) { + fprintf(stderr, "Unable to open VCPU %d: %s", vcpuid, + strerror(errno)); + exit(BHYVE_EXIT_ERROR); + } } if (bhyve_init_platform(ctx, bsp) != 0) diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 8c37b670ab2e..96768383d4ca 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 NetApp, Inc. + * Copyright (c) 2026 Hans Rosenfeld * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -408,6 +409,12 @@ main(int argc, char *argv[]) exit(1); } vcpu = vm_vcpu_open(ctx, vcpuid); + if (vcpu == NULL) { + fprintf(stderr, + "vm_vcpu_open: %s vcpu %d could not be opened: %s\n", + vmname, vcpuid, strerror(errno)); + exit(1); + } error = 0; if (!error && memsize) diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index 4cc566f334c3..3b416b7a5ad5 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -892,6 +892,8 @@ main(int argc, char** argv) } vcpu = vm_vcpu_open(ctx, BSP); + if (vcpu == NULL) + err(1, "vm_vcpu_open"); caph_cache_catpages(); if (caph_enter() < 0)