From nobody Fri Apr 1 09:19:43 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 932041A44854; Fri, 1 Apr 2022 09:19:44 +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 4KVF4J27q3z3G8n; Fri, 1 Apr 2022 09:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648804784; 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=sL13f4QaLxr6dMNB1A0YiynrzgG3KhSNh0TVdZX77Qs=; b=Ziw9JSR4peEcp0ntnD51NUJYwaztrw76tJB4/jgEZXZsl7RTBAe+oRqabS9ZEWKjRi/4W2 t663r3gMm4HuFeTS7Dcjk+lc++i9XTUVk1kneGBDZ8sqEWRuacn0tTLzIUmRbXg8elj/1P /OXbTO5EgZHSUMwrXp+FhnEjaFdT1mgnemeGaUqZdDAr8nqZnXYHjoZ3CSMZTUV6h5jonP 00EVuOc0/Ppzr38BxkfNDe1uKQ0Zys0oqGsn0I6ovEpd2PpRwe55jYG4Utlli3PkNTgHXG 1HJWZaMhXKigRoJw2nvh+UnIw8mxaqDF+A9MP4C8BS/t8VHe3Vp3BolvmO9PjQ== 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 462A8119DC; Fri, 1 Apr 2022 09:19:43 +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 2319JhRs091605; Fri, 1 Apr 2022 09:19:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2319JhW5091604; Fri, 1 Apr 2022 09:19:43 GMT (envelope-from git) Date: Fri, 1 Apr 2022 09:19:43 GMT Message-Id: <202204010919.2319JhW5091604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 3256b7ca36e7 - main - bhyve: avoid an empty passthru config value 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3256b7ca36e739a08f141a7ee52b9db9d995db85 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648804784; 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=sL13f4QaLxr6dMNB1A0YiynrzgG3KhSNh0TVdZX77Qs=; b=WNXXJaWXSnELTTU5SgCgjfKdX+S7AneXKhnelF4VfKpwIGvEhrjhuDJKXm+jv24xUkPFwo h1Vfy1tz5fqUCMGA8Zs1TfnNAooiDKEWNYyFU0bmkeXy79uCS3lk3gm4X/Hi/gLmgdaTMT Bj1/mhmOZDMiP5TX4JXs4wKg2zXsNxmeLTxf3JXira3bzWvbl6wiZ6vqJU+2RB+hxVjAT+ IbLRy34HMMo2mw0FcCoeMwBPAa/8gOqiLI4LReRO0y9nAwGI0qT0BZ++i1lGPi1qJgs/aJ xbT1WQKefEDvgZL0YtENL3o9C6YZ1z5x9I90S7bo0kN87RxILRlw4VQTP3+qOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648804784; a=rsa-sha256; cv=none; b=lAyPY5zNyiT6CWt9bYQ53am031hByIj3kUI/porg+fYv/haupsFAGaQ7x08djI4U3iz0ip uxj3Eud88xkhfFaENsRfTQeWQm9jfScm2OuVjAfdp58YmZJtZndv5LnWdpPQxwAy9cZjzf bJxHhs923l5oM+O//JEXRXYMqk59Uzh45Api9zSDqbtTA6anCaJjBkKpAXVPk0L5A2n4JG iGNMgCG2bHt+TZeTrmal2aqJlJQLBZbeu13uQWHi/fq1JOA++sJwaB6P27aHxXpwYBpm7t zBuPUYQAUxUOEjU/pEYDcw1q23ua7pGUMCE96ycMi5Jio15KaQZ3CxXgXYkeSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=3256b7ca36e739a08f141a7ee52b9db9d995db85 commit 3256b7ca36e739a08f141a7ee52b9db9d995db85 Author: Corvin Köhne AuthorDate: 2022-04-01 08:20:55 +0000 Commit: Emmanuel Vadot CommitDate: 2022-04-01 09:13:16 +0000 bhyve: avoid an empty passthru config value pci_parse_legacy_config splits the options string by comma characters. strchr returns a pointer to the first occurence of a character. In that case, it's a comma. So, pci_parse_legacy_config will stop at the first character and creates a new config node with a name of NULL. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D34600 --- usr.sbin/bhyve/pci_passthru.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index 3cb0649f4741..153554f97e43 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -662,7 +662,12 @@ passthru_legacy_config(nvlist_t *nvl, const char *opts) snprintf(value, sizeof(value), "%d", func); set_config_value_node(nvl, "func", value); - return (pci_parse_legacy_config(nvl, strchr(opts, ','))); + opts = strchr(opts, ','); + if (opts == NULL) { + return (0); + } + + return pci_parse_legacy_config(nvl, opts + 1); } static int