From nobody Fri Sep 23 21:09:33 2022 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 4MZ4XZ1dZQz4cwty; Fri, 23 Sep 2022 21:09:34 +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 4MZ4XZ10SCz3XhF; Fri, 23 Sep 2022 21:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663967374; 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=hQa2hQw940XDE4B42AIVzmTWTD2qEDrPB/R3IREuy4k=; b=xYcwPFP7Qcp87g/9835RG5dxAfuJH+wQg34SYZ7fxzSWyiWmNG1zXkACCqKkiGv3erXeYP y8fiOYDQzkNuYE52SdFplUWDjnf+uqg+lFHjYPkHT38qSpdMYw+xwP9ahjLBD9rKFZXVJq yYl6hCeZu+9TGV4MB7RYbvAHLqEppDWVmTYy7so8GxrABku3k3ugQiL+Yayuu7ohqogGkT eak9HBxWrQeIKvlb3b5TfGPoV0F/WwG8w7IgoPaJRUTpXUFS4gUFKZWpuzPLqzIUurqGvT sOCH0katRzNSXx8UdbB8t6gDMpJr+B10NEPJXveAnJBuN1O+dxC3svTWoM6TIg== 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 4MZ4XY6wfVzrlR; Fri, 23 Sep 2022 21:09:33 +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 28NL9Xer097509; Fri, 23 Sep 2022 21:09:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28NL9XTw097508; Fri, 23 Sep 2022 21:09:33 GMT (envelope-from git) Date: Fri, 23 Sep 2022 21:09:33 GMT Message-Id: <202209232109.28NL9XTw097508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d4accf60d9bd - main - arm64: don't loop forever if first option in kern.cfg.order not available 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4accf60d9bd257965620530d6893eb6889e0dd0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663967374; 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=hQa2hQw940XDE4B42AIVzmTWTD2qEDrPB/R3IREuy4k=; b=Whj18CBKTXJ+uR3q799SVVjQ+7Vug7sFWi675KxVmaH4BlJAmPhnIgV1dG5Gvy4wSgHfZs rmIhUYdyFxTj2x4Nc5T9bJebYLFk3Cnk2rV2tNnINqSQ5FHw3NwUV0tr4spoGpj01roZ8B 5VpzSTWCAO6ACBeXGAN1RbJIngX/fvKKoK70SrQKWvX58YKOnSpKU3tizWM+ZqNafdkxsL ABrKC8BHJGi2avO53qwYXo4i+I9o1iLcewXpRaBqaSNTHXrIB4cJR+gdALJljX0XQKipnk CB8oAYBCNOCpicie0EbX5QBVb3CX8HoD427lXhBtCShJ4sb3p4bu3+fBgGiUTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663967374; a=rsa-sha256; cv=none; b=OVAem5SA92DxGbQBCVbGUWj41XzAJkDS9P+qvoRyqKLqmOAZRW/p+y0hl7NbFIGKMpPfHq NeEFoBjyMVb25vgV18Yomr8mf3Y5exQf/O8ajZhXobiz+fv2VISOfnInBQCxDo/t8qRELl hE2+2AO2i4SixVw+4eNG0cvkQC4flgRj0FtmjKAcdDjBUcrYEzVHVihJ5ss7+4iDKlzzGL EELWXIHnKuI33fq/i7GY88wYiDwWbIvlsjm18SGx81G4qvSyCJy6vt/hozAQhiE0WwLcxF vGzncF2ad9V6Y4DfRRwuHPJux/13l/ChMlDNTadxs42KpQw6hWWHpTeJGkx/Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d4accf60d9bd257965620530d6893eb6889e0dd0 commit d4accf60d9bd257965620530d6893eb6889e0dd0 Author: Warner Losh AuthorDate: 2022-09-23 21:02:53 +0000 Commit: Warner Losh CommitDate: 2022-09-23 21:07:23 +0000 arm64: don't loop forever if first option in kern.cfg.order not available strchr returns a pointer to the ',', so if the first option in the list isn't available, we need to step over the , to look at the next option. So if kern.cfg.order="acpi,fdt" and we have no acpi, we'd loop forever with order=',fdt'. Sponsored by: Netflix Reviewed by: andrew, jhb Differential Revision: https://reviews.freebsd.org/D36682 --- sys/arm64/arm64/machdep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 51932905ec82..46773c1911b4 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -646,6 +646,8 @@ bus_probe(void) break; } order = strchr(order, ','); + if (order != NULL) + order++; /* Skip comma */ } freeenv(env);