From nobody Mon May 1 21:04:20 2023 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 4Q9G102w7Qz491Zj; Mon, 1 May 2023 21:04:20 +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 4Q9G102Ldsz3JKy; Mon, 1 May 2023 21:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682975060; 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=mK/fq7aynaWLRB/xWGtQcw73PWb1XKKw5flCAtzip6c=; b=hi8wiZ0kKGOfaeHeVGM4CVduwK/TBr98uLrbf0QbLnkrrw8nNp7TwFzhDmEolLPY4fACK8 TXWOsn/UQJ7RVq3gtjMAylIL+GWIMEXBe61lDozuxTxYp0W/Tq2pMalmK8Jt6WymklIdRi +hEo7kEfd3wcceLX1YyJekAvNhgdpetRNaGGf8Kv6uAFUIvPVgXgDGXcLt0GsRnrealGXb 0WOwyji3k1Ev7rTtYiQFunDh92i9o2Xc+cUatKYU6z0OV+jYT9aiCY/UD/DjB5JY4UFFtd vqtRqbSA7POPB3Ck6uOCo0UCuKU61TyIP/3odAnW9q5yheE6RWQd8U36fpXvKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682975060; 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=mK/fq7aynaWLRB/xWGtQcw73PWb1XKKw5flCAtzip6c=; b=RfKLJ7P6pxvEi4RxYUxseWy6fjSq6gUg6xdusHoBfnQVEUYnyxYyeub1/OFOukuNcFSeaN j83xyILI+a9riTkkfeAIFwoUAZePMDNGTRdF8BHdBojnqQMuEl0ct9EN2hg7fr0BbtB+WM iK9+Wm2Ia6LUslYwooJHIZglQfS2wfi69oMJMZlBkv2OBEejNjtHVd4ZpruTiYE2uCIo/r IHKjPovjteyx/N+KXLIZ5RgBceE2PAXPphBPpzl2cqO87G/PxXBec5WWrR7tS8KoYWK5ef X62V70K5zkNjrL/DLUmz783BWSNqycFzl4To0cX+mzwARtvcqXOfvhMgR/0SQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682975060; a=rsa-sha256; cv=none; b=E4D+Q2k4fD664uUZSRvtXb9rL+NMHP2+uwFMH4bf3bnkjWtDiWt0DSL6H983b4op85iqWz Zn4+OUJ0vyNIU5llvtfaXsCeTyFYSrk0FBZSpFmgkFeJVmfRMEfWyUb3t8CrY1EK4NyBHe /O5FjCvwCelOOeUZO77wty2t2Hl756Q2++Cbr3IwP6Qi5Z9SWWlgtHS6w11Pk4LV1ElI1b borXh8iQShaYFi8F9yYdfwxFW0yvYmnLCa+44wpgphYshJJq9vVrYG47NKftSquyR2YJbz Zivbp2l2AVYILfMO6Uhd1uvqkIjAVdwgKFmxutUknzF4SjHiIwzd/nyqciLFbw== 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 4Q9G101PX3zLM6; Mon, 1 May 2023 21:04:20 +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 341L4Kbr051893; Mon, 1 May 2023 21:04:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341L4KVY051892; Mon, 1 May 2023 21:04:20 GMT (envelope-from git) Date: Mon, 1 May 2023 21:04:20 GMT Message-Id: <202305012104.341L4KVY051892@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: d5babd0d2376 - main - stand/efi: Simplify code here 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5babd0d23769d365a83bebc0a5cd8cbfb55564d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d5babd0d23769d365a83bebc0a5cd8cbfb55564d commit d5babd0d23769d365a83bebc0a5cd8cbfb55564d Author: Warner Losh AuthorDate: 2023-05-01 15:28:25 +0000 Commit: Warner Losh CommitDate: 2023-05-01 21:02:53 +0000 stand/efi: Simplify code here We have plenty of stack in the EFI case, so use it instead of the complicated malloc / free dance. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D39415 --- stand/efi/loader/main.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 9ff5f1dd7674..e5f9b40ae55f 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -252,7 +252,6 @@ probe_zfs_currdev(uint64_t guid) { char *devname; struct zfs_devdesc currdev; - char *buf = NULL; bool bootable; currdev.dd.d_dev = &zfs_dev; @@ -265,18 +264,16 @@ probe_zfs_currdev(uint64_t guid) 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); - 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); + set_currdev(buf); + setenv("zfs-bootonce", buf, 1); } + (void)zfs_attach_nvstore(&currdev); } + return (bootable); } #endif