system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stand/userboot: Simplify code

Browse source 
We have way more than 8k of stack for the current value of the zfs
bootonce attribute. Allocate buf on the stack rather than the
complicated malloc / free dance.

Sponsored by:		Netflix
Reviewed by:		tsoome, kevans, jhb
Differential Revision:	https://reviews.freebsd.org/D39414
This commit is contained in:
Warner Losh 2023-05-01 09:28:17 -06:00
parent 0c4183f02e
commit 5ce98ee5f4
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
stand/userboot/userboot/main.c
View file

@ -235,7 +235,6 @@ extract_currdev(void)
struct devdesc *dd;
#if defined(USERBOOT_ZFS_SUPPORT)
struct zfs_devdesc zdev;
char *buf = NULL;
if (userboot_zfs_found) {
@ -272,17 +271,14 @@ extract_currdev(void)
#if defined(USERBOOT_ZFS_SUPPORT)
if (userboot_zfs_found) {
buf = malloc(VDEV_PAD_SIZE);
if (buf != NULL) {
if (zfs_get_bootonce(&zdev, 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(&zdev);
char buf[VDEV_PAD_SIZE];
if (zfs_get_bootonce(&zdev, OS_BOOTONCE, buf, sizeof(buf)) == 0) {
printf("zfs bootonce: %s\n", buf);
set_currdev(buf);
setenv("zfs-bootonce", buf, 1);
}
(void)zfs_attach_nvstore(&zdev);
}
#endif
}