From nobody Mon May 01 21:04:21 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 4Q9G113rNjz491Gf; Mon, 1 May 2023 21:04:21 +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 4Q9G113MSmz3JCc; Mon, 1 May 2023 21:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682975061; 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=ZFff6DH81IAYEJqUhhaQmIVWUYAhd9QB1u1pVAZArlA=; b=WryedrZQBy5kmCMEUTLnDDUZUz4PXe1HVV0WoDluGnsCuu3iCCbxIOl5EmR1TAKzIwLO2P PGaceMTLaeeNaywQQXvHgt+9JSuo1DJAcX397oxdkqrxJkseBin4FGbVpRHb1bf360atwu NS5QO+8OrKblQByeO2uKmKbxt0PHojAXF87+lNdFIjFbdL4eWWg/k+CxNPhpyKHcKWSHpt 518Dc5/i5aCwF+T1f4VTT8qvh3ZVseEaioE1jvTn5njUXMXxkHvtklJrpBRZ/yR94OOY5q 7l63ra46yv1MrdCuZdoU/U9tgZtg243N0ue//OtgneEXKoHP2J83WUu6HPsmwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682975061; 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=ZFff6DH81IAYEJqUhhaQmIVWUYAhd9QB1u1pVAZArlA=; b=s4LyaPlUA54vNpSlmeRQDM91TYZ09OqCDI/5uxnOdB7hG+3As0jPUV2BW+AU5uUvDGsopB PF8VmC3Fwg3IfpsnrCtHqQG8xQsX1VemvvzlNMwZdvfLQU/koRiW09befwUWX2z7e31ecG gQgP/odEDdiy26g7BIVuREwQzbC2H+YvIwGHA4wffgskwr83DZzqpd9JCUOxXgJspV+WTD qv5jnJ7grjPZnl1wGuIOJCng8NU/z6sdQuccxfGv29qBLTcv4jOG8yoSVvYeJIx4Bq2OjJ HibL3gEH82DjpEbjsZhKdNEdjzkLHhzvOUJESSKwU2wnhXlGR/6uugF7xL3lWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682975061; a=rsa-sha256; cv=none; b=rDWR8fRvFUM1DoRBtPEiSR05EJuA9jQO9rCBbmlQoJfSdhAgS/irAJjsl21kfWIQQuukLz XGSF7SlPOC8n8E7Vj3eI4LpZT/5RGNRBoEyWan9fkcdEJi4xL9BeGSYzOZ6fYNdqHkx7rd OT/ehOHbyBxixDi/f5hP0xpaXD9jc5GifD4A0Eszr3OI3Wb0XYMJr9i1pgzrRRZgZmYo+a nfXC+La6uoCjSsd8EwQK77jazjNn1MiImEioh1hYaV6hPJ4Ehz062VUyfiVA6rL3kUGPrd WWaToHwI6CTTiTm36Mb1Ef1u/cgzWjgq9GtpQuGb7Az0RqplsX0gdOVU+tztCw== 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 4Q9G112JWnzLXT; Mon, 1 May 2023 21:04:21 +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 341L4LAp051928; Mon, 1 May 2023 21:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341L4L17051927; Mon, 1 May 2023 21:04:21 GMT (envelope-from git) Date: Mon, 1 May 2023 21:04:21 GMT Message-Id: <202305012104.341L4L17051927@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: 5328f9034fc4 - main - stand/kboot: Simplify 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: 5328f9034fc410b105629700a1309bebf094266a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5328f9034fc410b105629700a1309bebf094266a commit 5328f9034fc410b105629700a1309bebf094266a Author: Warner Losh AuthorDate: 2023-05-01 15:28:32 +0000 Commit: Warner Losh CommitDate: 2023-05-01 21:02:53 +0000 stand/kboot: Simplify There's plenty of stack in kboot, so use it here rather than the malloc/free dance. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D39416 --- stand/kboot/hostdisk.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c index 5cc7825034dd..d28530891e0e 100644 --- a/stand/kboot/hostdisk.c +++ b/stand/kboot/hostdisk.c @@ -574,7 +574,6 @@ probe_zfs_currdev(uint64_t pool_guid, uint64_t root_guid, bool setcurrdev) { char *devname; struct zfs_devdesc currdev; - char *buf = NULL; bool bootable; currdev.dd.d_dev = &zfs_dev; @@ -587,18 +586,15 @@ probe_zfs_currdev(uint64_t pool_guid, uint64_t root_guid, bool setcurrdev) bootable = sanity_check_currdev(); if (bootable) { - buf = malloc(VDEV_PAD_SIZE); - if (buf != NULL) { - if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, - VDEV_PAD_SIZE) == 0) { - printf("zfs bootonce: %s\n", buf); - if (setcurrdev) - set_currdev(buf); - setenv("zfs-bootonce", buf, 1); - } - free(buf); - (void)zfs_attach_nvstore(&currdev); + char buf[VDEV_PAD_SIZE]; + + if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, sizeof(buf)) == 0) { + printf("zfs bootonce: %s\n", buf); + if (setcurrdev) + set_currdev(buf); + setenv("zfs-bootonce", buf, 1); } + (void)zfs_attach_nvstore(&currdev); init_zfs_boot_options(devname); } return (bootable);