From nobody Thu Jan 26 19:47:37 2023 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 4P2rpK65vtz3bnFv; Thu, 26 Jan 2023 19:47: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 4P2rpK5Mw1z4Ql7; Thu, 26 Jan 2023 19:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762457; 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=KU5xB4b07ft8+j8+1+6p71NLvTEfNqeBtkcywEFEBUc=; b=tHNTao02onWXvqBikdMzUgoDrJRXdXIOX1HVUR/s0t3upMPiUxpeSK9+V308QIIAFmX2fz ft9mTNE4e8kP/qMSSVOj/H9+DwkWrgEi+JTpFOsuz1lefdvxqKSbjpGcehsgfr6eXna0Vx GYS18yL8STadkZUXnUWsOOWhwNRFgHLwPCZG3gQJDtCSADuuDJ6TIdRhhOu/v0NGUGdPP3 i2R2MGEI/VChDudEvE3a0hEYlJVWo6dHBaGOi/80I1I0JPnWIYDSJCogmqKCtamEX6tJax SuHUKoQ7Wf5N0Q66pEp+Ea9Eh/oKVCgxMXd8buQcCKYE35+nc6Cw5fRfcH/u1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762457; 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=KU5xB4b07ft8+j8+1+6p71NLvTEfNqeBtkcywEFEBUc=; b=DE/ZawR0tji07k3Cer7N82+hIZl1njIyBQoAxelM8a8j7KZBcGGfxT6mBufkZ+v4OjcE75 94Q48hxRmE1BGNm8k4JgxIjGLqUhEHqmOuCsAl+f6r8b6RipQfSSRkbh6RPZMnUbD4ztky zWyP/ofKhdBKdnLombtljCJGpyZv6Tzcm24lazf6Z7ljg+i7ttv/te45EntA7l47BEoHsV HY9sMKqvoq2HLHdFUozQ9YJBA61hJ948mHuSVHiyN47cI8f6Z2nLYIXdEVDOvNSRWi/kBa DdVm1fcCJj6a3j2ORmVMIdhaBtZU2lSjg8QEeL6Z2uqpNkEbEMkeswqhsb2o6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674762457; a=rsa-sha256; cv=none; b=QxK7gF58x3jznsUS53tpUjK335p/cz6jxhNJaGRzg1ncFYQPprefL2Dq/gb9DvYACI0Fd1 LbqJOKSZ+srqPw0Q5shyibW/kFTc011kmwp0ZWazjy1Rk7MKv9CXQ/0BQVySE0XNNvv0zT 30wBJRNas4CMtahR5j9yVI8I0Xs2X1P9QgYym8hqzvnXfBDQmzbnigHZ8DnvShFkxxD76O 3e2xu1V0Xn7UvK1PgXPjpTMH4m3wgyS8Hy1IksIOEFzTcJlRNJtXi1vvivkdCcPP+KzERE uvvqyk4jbb4KHc4H0AlVgfnLEiEzz6rIis2L0lvLs7xKwmiaEU2fQ5EcxqQq6A== 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 4P2rpK4KhgzhMf; Thu, 26 Jan 2023 19:47:37 +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 30QJlbFi006853; Thu, 26 Jan 2023 19:47:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJlbZg006852; Thu, 26 Jan 2023 19:47:37 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:47:37 GMT Message-Id: <202301261947.30QJlbZg006852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0e81a14657d0 - stable/13 - bhyve: Report an error for invalid UUIDs. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e81a14657d0f9d6ae3de6b1cf5f8705a1b31993 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0e81a14657d0f9d6ae3de6b1cf5f8705a1b31993 commit 0e81a14657d0f9d6ae3de6b1cf5f8705a1b31993 Author: James Mintram AuthorDate: 2022-06-16 20:17:44 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:28:56 +0000 bhyve: Report an error for invalid UUIDs. Reviewed by: rgrimes, grehan, jhb Differential Revision: https://reviews.freebsd.org/D30050 (cherry picked from commit e16b709e2dcc45f01cf96b5e7f6d48474feff8d7) --- usr.sbin/bhyve/bhyverun.c | 3 ++- usr.sbin/bhyve/smbiostbl.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 70dd52c9b2b4..453c24794907 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1558,7 +1558,8 @@ main(int argc, char *argv[]) } error = smbios_build(ctx); - assert(error == 0); + if (error != 0) + exit(4); if (get_config_bool("acpi_tables")) { error = acpi_build(ctx, guest_ncpus); diff --git a/usr.sbin/bhyve/smbiostbl.c b/usr.sbin/bhyve/smbiostbl.c index ab8dfeeb532b..cafb0343519f 100644 --- a/usr.sbin/bhyve/smbiostbl.c +++ b/usr.sbin/bhyve/smbiostbl.c @@ -671,8 +671,10 @@ smbios_type1_initializer(const struct smbios_structure *template_entry, uint32_t status; uuid_from_string(guest_uuid_str, &uuid, &status); - if (status != uuid_s_ok) + if (status != uuid_s_ok) { + EPRINTLN("Invalid UUID"); return (-1); + } uuid_enc_le(&type1->uuid, &uuid); } else {