From nobody Mon Apr 17 17:04:02 2023 X-Original-To: dev-commits-src-branches@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 4Q0YLC0vyfz44vnB; Mon, 17 Apr 2023 17:04:03 +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 4Q0YLB4tlKz49ck; Mon, 17 Apr 2023 17:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751042; 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=5ExgMHSTd8b1B+AnOedURCWlEN3UmVTnAL+ByrPOwDM=; b=LN6rL7z+BwoZfySw0S0LL1pw8YPvrPPbDps0nz3U33k4Q++l5wzNB0dYV1a/BaVZLYqfgo vbt3Qa0fyoxEUJC7ClCY6BWTaQE0ai9Cn2nSdhjI8P+yUMvLQq9bwhV0XrDsViveAePMr3 g5RUCztPKy0CFhouRi80wBHEmK6nFe6mMm/OBCAIPQASkVQeZpt3M39jgbbVI2kJJsA7I1 Tl79cMossQjm1SCzrwRsZCIgsgRxVp5mapU0c6QQsycwqdIfL+O8IMCe6hlnxVoFzjdxgc DEH5GDJCK9ibJllA+w1On8v/SmAFo88K0uTwxMSEGtxTbK0qhnHVMc3LODQcxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681751042; 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=5ExgMHSTd8b1B+AnOedURCWlEN3UmVTnAL+ByrPOwDM=; b=oPEyTXiVGV3Iuls6nDmHrbI9AZq88K9m0tzESyXLl9zntninz7VOXKf+I1LFvAgqGtKnsm sI/OaNw6HiP64nN7YtfFbxRqQcLrbGOS1I/hTfIkk5QL6JDy6TXrx6n+hTSlRkLZEm74KA WnHBEwwPD20BY6X35KAEq8nVXu5sYP530B4E6J66iqbvAGZkh8/chK3SVp5KhXdlnMUaIg 2jql/KFkPNX0W8fC8GGgxM+BF54MW/RZSgVxZ9lSo/Z7HaS1zCRJBbnR/IqfXAo6v/hM9q D1e3NtZyDTWcLHawPLb34RLbkTmYz3hGhRcPH8VuTmvZzZ/uzbTP/U5wX5jMKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681751042; a=rsa-sha256; cv=none; b=I2yAC7vOncIqrIzS4A6GoX+7FMJoUYGVME0CflSdDz88+OLJsnyuWDn8NhpY/fAbU0iCW6 w+Kr4LwAQLOFz2AaJem+S29sLtPvPV9t9Ers0W+nBde5rjl5OTnfXrGKaN1ZXwNLKS2+jY 3z1chNCg8OOBSr5liOu0SRh/c0k3wTB38fZnC+kefZvHs9xFEfD32y1VaAa4J7oeERQcuf vYO/U3s8i6Jr4ZBc3W7QL/JAm+JEun9ap65sn6uqk7wgBfQWaT0SBan7uifPLcj+0LF6V+ El5SrToLZ75kfUBjpA19Umkw7AuHyNkfd6HcjuCr2TWqWyjzns2rRtGhCOP26A== 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 4Q0YLB3xW8zd4d; Mon, 17 Apr 2023 17:04:02 +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 33HH42Ce002575; Mon, 17 Apr 2023 17:04:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HH42rd002574; Mon, 17 Apr 2023 17:04:02 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:04:02 GMT Message-Id: <202304171704.33HH42rd002574@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 19866d1a162f - stable/13 - ofwbus: only allow unit number zero List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 19866d1a162fca492ca5a7776d209d1ea4ae565e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=19866d1a162fca492ca5a7776d209d1ea4ae565e commit 19866d1a162fca492ca5a7776d209d1ea4ae565e Author: Mitchell Horne AuthorDate: 2023-02-13 17:44:03 +0000 Commit: Mitchell Horne CommitDate: 2023-04-17 16:54:04 +0000 ofwbus: only allow unit number zero ofwbus has always been the root of attachment for OFW/FDT platforms. It may have simplebus children, but we expect only one instance of the ofwbus driver, added directly by nexus. We may as well ensure this remains the case. Reviewed by: jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D38493 (cherry picked from commit afca197f5240ce2c2c7abfe5c9fbc50ba55f178b) --- sys/dev/ofw/ofwbus.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/ofw/ofwbus.c b/sys/dev/ofw/ofwbus.c index 7660be8cec39..c97fd41bb683 100644 --- a/sys/dev/ofw/ofwbus.c +++ b/sys/dev/ofw/ofwbus.c @@ -98,6 +98,11 @@ ofwbus_probe(device_t dev) if (OF_peer(0) == 0) return (ENXIO); + /* Only one instance of ofwbus. */ + if (device_get_unit(dev) != 0) + panic("ofwbus added with non-zero unit number: %d\n", + device_get_unit(dev)); + device_set_desc(dev, "Open Firmware Device Tree"); return (BUS_PROBE_NOWILDCARD); }