February 2022 - U-Boot

Issue with spi-uclass.c and mxc_spi.c when DM_SPI_FLASH is enabled
by Abder 01 Feb '22

01 Feb '22

Hi everyone, Recently I've been working on the upgrade of an old u-boot to u-boot2020, and I encountered an issue when I enabled DM_SPI and DM_SPI_FLASH ! My board (based on IMX6) uses a NOR flash SPI to store the u-boot environment and the SPI interface is initialized early in boot. Using the mxc_spi.c as a SPI driver for my IMX6 soc, after I enabled the two configs above I got a data abort ! after thorough analysis and backtracking, i found the origin of the data abort (access to invalid memory region) which is in the function below from NXPs driver mxc_spi.c: static void mxc_spi_cs_activate(struct mxc_spi_slave *mxcs) { #if CONFIG_IS_ENABLED(DM_SPI) struct udevice *dev = mxcs->dev; struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev); u32 cs = slave_plat->cs; if (!dm_gpio_is_valid(&mxcs->cs_gpios[cs])) return; dm_gpio_set_value(&mxcs->cs_gpios[cs], 1); #else if (mxcs->gpio > 0) gpio_set_value(mxcs->gpio, mxcs->ss_pol); #endif } In this function the logic in activating the cs (chip select) is by getting the pin from the platdata of the device's parent and enabling it, as any DM driver would do. However, This function expects that the cs number from platdata (slave_plat->cs in above code) corresponds to the position of the gpio tuple in the "cs-gpios" property from the FDT (e.g. tuple position in : cs-gpios = <&gpio1 0 0>, <0>, <&gpio1 1 0>, <&gpio1 2 0>;) and not the actual number of the cs gpio pin. But the issue is that what it gets from the platdata is the latter i.e. the cs gpio pin number ! And in my case the actual number of the cs gpio pin is 120 (GPIO4_IO24) which results in accessing the mxcs->cs_gpios[120] knowing that the size of the table is only 4 ! which in turn leads to a data abort ! I'm mentioning that this issue is related also to spi_uclass.c, because, from what I could understand by reading the source code, the platdata for the device is not initialized properly ! the function spi-uclass.c/spi_slave_ofdata_to_platdata() responsible for initializing correctly the platdata from the values in the FDT, is never called ! because the "node" udevice property is null for the device, and node=null is set when binding the device to the driver via the function device_bind_driver() and never filled afterwards. I would like to know if there is an issue about this in either drivers, or I'm missing something in the code ? Any help is greatly appreciated ! Thank you -- Abder

2 1

[PATCH v4 0/4] imx8m: move env_get_location for imx8mn and imx8mp at board level
by Tommaso Merciai 01 Feb '22

01 Feb '22

This series move env_get_location from soc to board level. As suggested by Michael <michael(a)amarulasolutions.com> make no sense to define an unique way for multiple board. One board can boot from emmc and having env on spi flash etc.. Anyways, this function is kept in imx8mn_evk, imx8mp_evk, phycore-imx8mp and imx8mn_beacon boards instead of being completely dropped. Note for all imx8mp/imx8mn users: This patch move only the env_get_location function at board level in this way every users can override it depending on own needs. Test it. Tommaso Merciai (4): imx8m: drop env_get_location for imx8mn and imx8mp imx: imx8mn_evk: override env_get_location imx: imx8mp_evk: override env_get_location phytec: phycore_imx8mp: override env_get_location arch/arm/mach-imx/imx8m/soc.c | 39 -------------------- board/freescale/imx8mn_evk/imx8mn_evk.c | 35 ++++++++++++++++++ board/freescale/imx8mp_evk/imx8mp_evk.c | 34 +++++++++++++++++ board/phytec/phycore_imx8mp/phycore-imx8mp.c | 33 +++++++++++++++++ 4 files changed, 102 insertions(+), 39 deletions(-) -- 2.25.1

3 25

[PATCH] mtd: cfi_mtd: populate mtd->dev with flash_info->dev
by Patrice Chotard 01 Feb '22

01 Feb '22

Populate mtd->dev with flash_info->dev which allows to get full mtd information using the "mtd list" command. Before, "mtd list" command returns : List of MTD devices: * nor0 - type: NOR flash - block size: 0x40000 bytes - min I/O: 0x1 bytes - 0x000000000000-0x000004000000 : "nor0" After this patch we get for example: List of MTD devices: * nor0 - device: flash@0 - parent: spi@40430000 - driver: cfi_flash - path: /soc/spi@40430000/flash@0 - type: NOR flash - block size: 0x40000 bytes - min I/O: 0x1 bytes - 0x000000000000-0x000004000000 : "nor0" Signed-off-by: Patrice Chotard <patrice.chotard(a)foss.st.com> --- drivers/mtd/cfi_mtd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c index 2295bb7220..1475461a59 100644 --- a/drivers/mtd/cfi_mtd.c +++ b/drivers/mtd/cfi_mtd.c @@ -221,6 +221,9 @@ int cfi_mtd_init(void) continue; sprintf(cfi_mtd_names[i], "nor%d", i); +#ifdef CONFIG_CFI_FLASH + mtd->dev = fi->dev; +#endif mtd->name = cfi_mtd_names[i]; mtd->type = MTD_NORFLASH; mtd->flags = MTD_CAP_NORFLASH; -- 2.17.1

2 2

Question on running uboot_testpy with tbot
by Simon Glass 01 Feb '22

01 Feb '22

Hi, I am trying to run the pytests on my unit. The documentation doesn't really explain how it works. This is what I am trying: $ tbot -vv -l kea.py -b rpi3.py -T tbot/contrib -p 'testpy_args=["-k", "help", "-vv"]' uboot_testpy tbot starting ... ├─Parameters: │ testpy_args = ['-k', 'help', '-vv'] ├─Calling uboot_testpy ... │ ├─Logging in on sglass@kea:22 ... │ ├─[sglass] bash --norc --noprofile │ ├─Calling uboot_setup_testhooks ... │ │ ├─[sglass] echo " ${HOME}" │ │ │ ## /home/sglass │ │ ├─[sglass] mkdir -p /home/sglass/tbot-workdir │ │ ├─[sglass] test -d /home/sglass/tbot-workdir/uboot-testpy-tbot │ │ ├─Creating FIFOs ... │ │ ├─[sglass] rm -rf /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_console_send │ │ ├─[sglass] mkfifo /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_console_send │ │ ├─[sglass] rm -rf /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_console_recv │ │ ├─[sglass] mkfifo /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_console_recv │ │ ├─[sglass] rm -rf /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_commands │ │ ├─[sglass] mkfifo /home/sglass/tbot-workdir/uboot-testpy-tbot/fifo_commands │ │ ├─[sglass] cat /home/sglass/tbot-workdir/uboot-testpy-tbot/tbot-scripts.sha256 │ │ │ ## 2d30892b61eb713ce9413e06c4f2a0cd00d2a74b6b8c2ac6624e1e49909b1897 │ │ ├─Hooks are up to date, skipping deployment ... │ │ ├─Adding hooks to $PATH ... │ │ ├─[sglass] echo " ${PATH}" │ │ │ ## /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/cosarm/depot_tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/cosarm/depot_tools:/home/sglass/.local/bin:/vid/software/devel/ubtest/u-boot-test-hooks/bin:/vid/software/devel/ubtest/standalone-hdctools │ │ ├─[sglass] export PATH=/home/sglass/tbot-workdir/uboot-testpy-tbot:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/cosarm/depot_tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/cosarm/depot_tools:/home/sglass/.local/bin:/vid/software/devel/ubtest/u-boot-test-hooks/bin:/vid/software/devel/ubtest/standalone-hdctools │ │ ├─Open console & command channels ... │ │ ├─[sglass] /home/sglass/tbot-workdir/uboot-testpy-tbot/tbot-console │ │ ├─[sglass] /home/sglass/tbot-workdir/uboot-testpy-tbot/tbot-commands │ │ └─Done. (0.028s) │ ├─Calling uboot_checkout ... │ │ ├─Builder: rpi3 │ │ ├─[sglass] test -d /home/sglass/tbot-workdir/uboot-rpi3/.git │ │ ├─[sglass] git -C /home/sglass/tbot-workdir/uboot-rpi3 fetch │ │ └─Done. (0.121s) │ ├─[sglass] test -e /home/sglass/tbot-workdir/uboot-rpi3/.config │ ├─[sglass] test -e /home/sglass/tbot-workdir/uboot-rpi3/include/ autoconf.mk │ ├─[sglass] picocom -q -b 115200 /dev/ttyusb_port1 │ ├─POWERON (rpi3) │ ├─[sglass] sd-mux-ctrl --device-serial sdwire-18 --dut │ ├─[sglass] ykushcmd -s YK17698 -g 1 │ │ ## │ │ ## │ │ ## Downstream port 1 is OFF │ │ ## │ ├─[sglass] ykushcmd -s YK17698 -u 1 │ ├─UBOOT (rpi3-u-boot) │ │ <> │ │ <> │ │ <> U-Boot 2020.10-rc2-00140-g392aa09f310 (Oct 30 2021 - 12:38:07 -0600) │ │ <> │ │ <> DRAM: 992 MiB │ │ <> RPI 3 Model B (0xa22082) │ │ <> MMC: mmc@7e202000: 0, sdhci@7e300000: 1 │ │ <> Loading Environment from FAT... *** Warning - bad CRC, using default environment │ │ <> │ │ <> In: serial │ │ <> Out: vidconsole │ │ <> Err: vidconsole │ │ <> Net: No ethernet found. │ │ <> Hit any key to stop autoboot: 0 │ │ <> U-Boot> │ ├─[sglass] cd /home/sglass/tbot-workdir/uboot-rpi3 │ ├─[sglass] ./test/py/test.py --build-dir . --board-type unknown -k help -vv │ │ ## +u-boot-test-flash unknown na │ │ ## ============================= test session starts ============================== │ │ ## platform linux -- Python 3.6.9, pytest-5.2.1, py-1.8.0, pluggy-0.13.0 -- /usr/bin/python3 │ │ ## cachedir: .pytest_cache │ │ ## rootdir: /home/sglass/tbot-workdir/uboot-rpi3/test/py, inifile: pytest.ini │ │ ## collected 324 items / 322 deselected / 2 selected │ │ ## │ │ ## test/py/tests/test_fpga.py::test_fpga_help SKIPPED [ 50%]│ ├─[sglass] ykushcmd -s YK17698 -d 1 │ ├─[sglass] sd-mux-ctrl --device-serial sdwire-18 --ts │ ├─Exiting poweroff │ ├─[sglass] sd-mux-ctrl --device-serial sdwire-18 --dut │ ├─[sglass] ykushcmd -s YK17698 -g 1 │ │ ## │ │ ## │ │ ## Downstream port 1 is OFF │ │ ## │ ├─[sglass] ykushcmd -s YK17698 -u 1 │ ├─POWEROFF (rpi3) │ ├─[sglass] ykushcmd -s YK17698 -d 1 │ ├─[sglass] sd-mux-ctrl --device-serial sdwire-18 --ts │ ├─Exiting poweroff │ └─Fail. (38.376s) ├─Exception: │ Traceback (most recent call last): │ File "/home/sglass/.local/lib/python3.8/site-packages/tbot-0.9.2-py3.8.egg/tbot/main.py", line 345, in main │ func(**params) │ File "/home/sglass/.local/lib/python3.8/site-packages/tbot-0.9.2-py3.8.egg/tbot/decorators.py", line 92, in wrapped │ return tc(*args, **kwargs) │ File "/home/sglass/.local/lib/python3.8/site-packages/tbot-0.9.2-py3.8.egg/tbot/decorators.py", line 157, in wrapped │ return tc(lh, *args, **kwargs) │ File "/home/sglass/.local/lib/python3.8/site-packages/tbot-0.9.2-py3.8.egg/tbot/tc/uboot/testpy.py", line 321, in testpy │ os.write(chan_console.fileno(), data) │ OSError: [Errno 9] Bad file descriptor ├───────────────────────────────────────── └─FAILURE (38.488s) I don't see the output appearing and I'm not sure how pytest is sending the commands to the board? Regards, Simon

2 5

[PATCH 0/2] EFI: Reset system after capsule-on-disk
by Masami Hiramatsu 01 Feb '22

01 Feb '22

Hi, According to Takahiro's suggestion and discussion, I made a patchset to update the EFI capsule-on-disk, so that it does not use UpdateCapsule() EFI API and reset after completing the capsule-on-disk. The reset after completing the capsule-on-disk is stated in the UEFI specification 2.9, section 8.5.5 "Delivery of Capsules via file on Mass Storage device" as below, In all cases that a capsule is identified for processing the system is restarted after capsule processing is completed. Note that this feature is enabled by CONFIG_EFI_RESET_AFTER_CAPSULE_ON_DISK. If you want to keep the current firmware runs after capsule-on-disk (e.g. for debugging), you can configure it disabled. Thank you, --- Masami Hiramatsu (2): efi_loader: Avoid using efi_update_capsule() from update capsule on disk efi_loader: Reset system after CapsuleUpdate on disk lib/efi_loader/Kconfig | 10 ++++++++++ lib/efi_loader/efi_capsule.c | 18 +++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) -- Masami Hiramatsu <masami.hiramatsu(a)linaro.org>

4 9

[scan-admin@coverity.com: New Defects reported by Coverity Scan for Das U-Boot]
by Tom Rini 01 Feb '22

01 Feb '22

Hey folks, Here's the latest report and I think some of these are new tests rather than new code. ----- Forwarded message from scan-admin(a)coverity.com ----- Date: Mon, 31 Jan 2022 23:09:01 +0000 (UTC) From: scan-admin(a)coverity.com To: tom.rini(a)gmail.com Subject: New Defects reported by Coverity Scan for Das U-Boot Hi, Please find the latest report on new defect(s) introduced to Das U-Boot found with Coverity Scan. 9 new defect(s) introduced to Das U-Boot found with Coverity Scan. 5 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent build analyzed by Coverity Scan. New defect(s) Reported-by: Coverity Scan Showing 9 of 9 defect(s) ** CID 345920: API usage errors (CHAR_IO) /tools/bmp_logo.c: 165 in main() ________________________________________________________________________________________________________ *** CID 345920: API usage errors (CHAR_IO) /tools/bmp_logo.c: 165 in main() 159 "#define __BMP_LOGO_DATA_H__\n\n"); 160 161 /* read and print the palette information */ 162 printf("unsigned short bmp_logo_palette[] = {\n"); 163 164 for (i=0; i<n_colors; ++i) { >>> CID 345920: API usage errors (CHAR_IO) >>> Assigning the return value of "fgetc" to char "b->palette[(int)(i * 3 + 2)]" truncates its value. 165 b->palette[(int)(i*3+2)] = fgetc(fp); 166 b->palette[(int)(i*3+1)] = fgetc(fp); 167 b->palette[(int)(i*3+0)] = fgetc(fp); 168 x=fgetc(fp); 169 170 printf ("%s0x0%X%X%X,%s", ** CID 345919: Resource leaks (RESOURCE_LEAK) /tools/image-host.c: 969 in fit_config_get_regions() ________________________________________________________________________________________________________ *** CID 345919: Resource leaks (RESOURCE_LEAK) /tools/image-host.c: 969 in fit_config_get_regions() 963 len += strlen(node_inc.strings[i]) + 1; 964 } 965 region_prop = malloc(len); 966 if (!region_prop) { 967 printf("Out of memory setting up regions for configuration '%s/%s'\n", 968 conf_name, sig_name); >>> CID 345919: Resource leaks (RESOURCE_LEAK) >>> Variable "region" going out of scope leaks the storage it points to. 969 return -ENOMEM; 970 } 971 for (i = len = 0; i < node_inc.count; 972 len += strlen(node_inc.strings[i]) + 1, i++) 973 strcpy(region_prop + len, node_inc.strings[i]); 974 strlist_free(&node_inc); ** CID 345918: Error handling issues (CHECKED_RETURN) /tools/bmp_logo.c: 41 in skip_bytes() ________________________________________________________________________________________________________ *** CID 345918: Error handling issues (CHECKED_RETURN) /tools/bmp_logo.c: 41 in skip_bytes() 35 return val; 36 } 37 38 void skip_bytes (FILE *fp, int n) 39 { 40 while (n-- > 0) >>> CID 345918: Error handling issues (CHECKED_RETURN) >>> Calling "fgetc(fp)" without checking return value. This library function may fail and return an error code. [Note: The source code implementation of the function has been overridden by a builtin model.] 41 fgetc (fp); 42 } 43 44 __attribute__ ((__noreturn__)) 45 int error (char * msg, FILE *fp) 46 { ** CID 345917: Resource leaks (RESOURCE_LEAK) /tools/mkeficapsule.c: 121 in read_bin_file() ________________________________________________________________________________________________________ *** CID 345917: Resource leaks (RESOURCE_LEAK) /tools/mkeficapsule.c: 121 in read_bin_file() 115 116 *data = buf; 117 *bin_size = bin_stat.st_size; 118 err: 119 fclose(g); 120 >>> CID 345917: Resource leaks (RESOURCE_LEAK) >>> Variable "buf" going out of scope leaks the storage it points to. 121 return ret; 122 } 123 124 /** 125 * write_capsule_file - write a capsule file 126 * @bin: FILE stream ** CID 345916: Code maintainability issues (UNUSED_VALUE) /tools/bmp_logo.c: 168 in main() ________________________________________________________________________________________________________ *** CID 345916: Code maintainability issues (UNUSED_VALUE) /tools/bmp_logo.c: 168 in main() 162 printf("unsigned short bmp_logo_palette[] = {\n"); 163 164 for (i=0; i<n_colors; ++i) { 165 b->palette[(int)(i*3+2)] = fgetc(fp); 166 b->palette[(int)(i*3+1)] = fgetc(fp); 167 b->palette[(int)(i*3+0)] = fgetc(fp); >>> CID 345916: Code maintainability issues (UNUSED_VALUE) >>> Assigning value from "fgetc(fp)" to "x" here, but that stored value is overwritten before it can be used. 168 x=fgetc(fp); 169 170 printf ("%s0x0%X%X%X,%s", 171 ((i%8) == 0) ? "\t" : " ", 172 (b->palette[(int)(i*3+0)] >> 4) & 0x0F, 173 (b->palette[(int)(i*3+1)] >> 4) & 0x0F, ** CID 345915: Control flow issues (NO_EFFECT) /lib/image-sparse.c: 214 in write_sparse_image() ________________________________________________________________________________________________________ *** CID 345915: Control flow issues (NO_EFFECT) /lib/image-sparse.c: 214 in write_sparse_image() 208 response); 209 return -1; 210 } 211 212 blks = write_sparse_chunk_raw(info, blk, blkcnt, 213 data, response); >>> CID 345915: Control flow issues (NO_EFFECT) >>> This less-than-zero comparison of an unsigned value is never true. "blks < 0UL". 214 if (blks < 0) 215 return -1; 216 217 blk += blks; 218 bytes_written += ((u64)blkcnt) * info->blksz; 219 total_blocks += chunk_header->chunk_sz; ** CID 345914: Integer handling issues (CONSTANT_EXPRESSION_RESULT) /tools/mkeficapsule.c: 96 in read_bin_file() ________________________________________________________________________________________________________ *** CID 345914: Integer handling issues (CONSTANT_EXPRESSION_RESULT) /tools/mkeficapsule.c: 96 in read_bin_file() 90 } 91 if (stat(bin, &bin_stat) < 0) { 92 fprintf(stderr, "cannot determine the size of %s\n", bin); 93 ret = -1; 94 goto err; 95 } >>> CID 345914: Integer handling issues (CONSTANT_EXPRESSION_RESULT) >>> "bin_stat.st_size > 18446744073709551615UL" is always false regardless of the values of its operands. This occurs as the logical operand of "if". 96 if (bin_stat.st_size > SIZE_MAX) { 97 fprintf(stderr, "file size is too large for malloc: %s\n", bin); 98 ret = -1; 99 goto err; 100 } 101 buf = malloc(bin_stat.st_size); ** CID 345913: (TAINTED_SCALAR) /drivers/core/ofnode.c: 477 in ofnode_read_string_list() ________________________________________________________________________________________________________ *** CID 345913: (TAINTED_SCALAR) /drivers/core/ofnode.c: 473 in ofnode_read_string_list() 467 count = ofnode_read_string_count(node, property); 468 if (count < 0) 469 return count; 470 if (!count) 471 return 0; 472 >>> CID 345913: (TAINTED_SCALAR) >>> Passing tainted expression "count + 1" to "dlcalloc", which uses it as an offset. 473 prop = calloc(count + 1, sizeof(char *)); 474 if (!prop) 475 return -ENOMEM; 476 477 for (i = 0; i < count; i++) 478 ofnode_read_string_index(node, property, i, &prop[i]); /drivers/core/ofnode.c: 477 in ofnode_read_string_list() 471 return 0; 472 473 prop = calloc(count + 1, sizeof(char *)); 474 if (!prop) 475 return -ENOMEM; 476 >>> CID 345913: (TAINTED_SCALAR) >>> Using tainted variable "count" as a loop boundary. 477 for (i = 0; i < count; i++) 478 ofnode_read_string_index(node, property, i, &prop[i]); 479 prop[count] = NULL; 480 *listp = prop; 481 482 return count; ** CID 345912: Null pointer dereferences (FORWARD_NULL) /lib/efi_loader/efi_signature.c: 232 in efi_signature_lookup_digest() ________________________________________________________________________________________________________ *** CID 345912: Null pointer dereferences (FORWARD_NULL) /lib/efi_loader/efi_signature.c: 232 in efi_signature_lookup_digest() 226 sig_data = sig_data->next) { 227 #ifdef DEBUG 228 EFI_PRINT("Msg digest in database:\n"); 229 print_hex_dump(" ", DUMP_PREFIX_OFFSET, 16, 1, 230 sig_data->data, sig_data->size, false); 231 #endif >>> CID 345912: Null pointer dereferences (FORWARD_NULL) >>> Passing null pointer "hash" to "memcmp", which dereferences it. [Note: The source code implementation of the function has been overridden by a builtin model.] 232 if (sig_data->size == size && 233 !memcmp(sig_data->data, hash, size)) { 234 found = true; 235 free(hash); 236 goto out; 237 } ________________________________________________________________________________________________________ To view the defects in Coverity Scan visit, https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P… To manage Coverity Scan email notifications for "tom.rini(a)gmail.com", click https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P… ----- End forwarded message ----- -- Tom

1 0

[PATCH] [v3] add kaslr-seed generation to extlinux.conf
by Zhang Ning 01 Feb '22

01 Feb '22

1, add kaslrseed key word to extlinux.conf 2, check kaslrseed in extlinux boot label 3, generate ramdon number from hw rng 4, add kaslr-seed to fdt chosen with this patch exlinux.conf boot item looks like label l0 menu testing linux /boot/vmlinuz-5.15.16-arm initrd /boot/initramfs-5.15.16-arm.img fdtdir /boot/dtbs/5.15.16-arm/ kaslrseed append root=UUID=92ae1e50-eeeb-4c5b-8939-7e1cd6cfb059 ro Signed-off-by: Zhang Ning <zhangn1985(a)qq.com> --- boot/pxe_utils.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ include/pxe_utils.h | 2 ++ 2 files changed, 77 insertions(+) diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index bb231b11a2..0c24becae3 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -20,6 +20,11 @@ #include <errno.h> #include <linux/list.h> +#ifdef CONFIG_DM_RNG +#include <dm.h> +#include <rng.h> +#endif + #include <splash.h> #include <asm/io.h> @@ -311,6 +316,67 @@ static int label_localboot(struct pxe_label *label) return run_command_list(localcmd, strlen(localcmd), 0); } +/* + * label_boot_kaslrseed generate kaslrseed from hw rng + */ + +static void label_boot_kaslrseed(void) +{ +#ifdef CONFIG_DM_RNG + ulong fdt_addr; + struct fdt_header *working_fdt; + size_t n = 0x8; + struct udevice *dev; + u64 *buf; + int nodeoffset; + int err; + + /* Get the main fdt and map it */ + fdt_addr = hextoul(env_get("fdt_addr_r"), NULL); + working_fdt = map_sysmem(fdt_addr, 0); + err = fdt_check_header(working_fdt); + if (err) + return; + + /* add extra size for holding kaslr-seed */ + /* err is new fdt size, 0 or negtive */ + err = fdt_shrink_to_minimum(working_fdt, 512); + if (err <= 0) + return; + + if (uclass_get_device(UCLASS_RNG, 0, &dev) || !dev) { + printf("No RNG device\n"); + return; + } + + nodeoffset = fdt_find_or_add_subnode(working_fdt, 0, "chosen"); + if (nodeoffset < 0) { + printf("Reading chosen node failed\n"); + return; + } + + buf = malloc(n); + if (!buf) { + printf("Out of memory\n"); + return; + } + + if (dm_rng_read(dev, buf, n)) { + printf("Reading RNG failed\n"); + goto err; + } + + err = fdt_setprop(working_fdt, nodeoffset, "kaslr-seed", buf, sizeof(buf)); + if (err < 0) { + printf("Unable to set kaslr-seed on chosen node: %s\n", fdt_strerror(err)); + goto err; + } +err: + free(buf); +#endif + return; +} + /** * label_boot_fdtoverlay() - Loads fdt overlays specified in 'fdtoverlays' * @@ -631,6 +697,9 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) } } + if (label->kaslrseed) + label_boot_kaslrseed(); + #ifdef CONFIG_OF_LIBFDT_OVERLAY if (label->fdtoverlays) label_boot_fdtoverlay(ctx, label); @@ -710,6 +779,7 @@ enum token_type { T_ONTIMEOUT, T_IPAPPEND, T_BACKGROUND, + T_KASLRSEED, T_INVALID }; @@ -741,6 +811,7 @@ static const struct token keywords[] = { {"ontimeout", T_ONTIMEOUT,}, {"ipappend", T_IPAPPEND,}, {"background", T_BACKGROUND,}, + {"kaslrseed", T_KASLRSEED,}, {NULL, T_INVALID} }; @@ -1194,6 +1265,10 @@ static int parse_label(char **c, struct pxe_menu *cfg) err = parse_integer(c, &label->ipappend); break; + case T_KASLRSEED: + label->kaslrseed = 1; + break; + case T_EOL: break; diff --git a/include/pxe_utils.h b/include/pxe_utils.h index dad2668818..4a73b2aace 100644 --- a/include/pxe_utils.h +++ b/include/pxe_utils.h @@ -33,6 +33,7 @@ * initrd - path to the initrd to use for this label. * attempted - 0 if we haven't tried to boot this label, 1 if we have. * localboot - 1 if this label specified 'localboot', 0 otherwise. + * kaslrseed - 1 if generate kaslrseed from hw_rng * list - lets these form a list, which a pxe_menu struct will hold. */ struct pxe_label { @@ -50,6 +51,7 @@ struct pxe_label { int attempted; int localboot; int localboot_val; + int kaslrseed; struct list_head list; }; -- 2.34.1

2 3