April 2024 - U-Boot

[PATCH 0/4] zlib: Address CVE-2016-9841
by Michal Simek 12 Apr '24

12 Apr '24

Hi, it looks like that only CVE-2016-9841 is not fixed and this series is trying to address it. The first two patches are just preparation based on changes which happened in past. The third one is actual fix and the last one is following what has been done in Linux kernel long time ago and don't use incorrect zlib version string. I tested it with and I can't see any issue. ./test/py/test.py --bd sandbox --build -s And gitlab CI is also not showing any issue. Thanks, Michal Michal Simek (4): zlib: Rename this variable to here (current decoding table entry) zlib: Rename write variable to wnext (window write index) zlib: Port fix for CVE-2016-9841 to U-Boot zlib: Remove incorrect ZLIB_VERSION include/u-boot/zlib.h | 16 ++-- lib/gzip.c | 2 +- lib/zlib/deflate.c | 13 +--- lib/zlib/inffast.c | 176 ++++++++++++++++-------------------------- lib/zlib/inflate.c | 31 ++++---- lib/zlib/inflate.h | 2 +- lib/zlib/zutil.c | 1 - 7 files changed, 90 insertions(+), 151 deletions(-) -- 2.44.0

2 6

[PATCH 00/13] EFI: capsule: ti: enable authenticated capsules
by Jonathan Humphreys 12 Apr '24

12 Apr '24

Create an EFI signature list (.esl) file based on the TI dummy key. Enable capsule authentication for several TI SoC based platforms: AM64, AM62, AM62p, BeaglePlay, J7, and BeagleboneAI. Jonathan Humphreys (13): ti:keys Add EFI signature list configs: am64x: Set capsule update signature list file configs: am64x: Enable capsule authentication configs: j721e: Set capsule update signature list file configs: j721e: Enable capsule authentication configs: beagleplay: Set capsule update signature list file configs: beagleplay: Enable capsule authentication configs: am62px: Set capsule update signature list file configs: am62px: Enable capsule authentication configs: am62x: Set capsule update signature list file configs: am62x: Enable capsule authentication configs: beagleboneai64: Set capsule update signature list file configs: beagleboneai64: Enable capsule authentication arch/arm/mach-k3/keys/custMpk.esl | Bin 0 -> 1523 bytes configs/am62px_evm_a53_defconfig | 2 ++ configs/am62x_beagleplay_a53_defconfig | 2 ++ configs/am62x_evm_a53_defconfig | 2 ++ configs/am64x_evm_a53_defconfig | 2 ++ configs/j721e_beagleboneai64_a72_defconfig | 2 ++ configs/j721e_evm_a72_defconfig | 2 ++ 7 files changed, 12 insertions(+) create mode 100644 arch/arm/mach-k3/keys/custMpk.esl -- 2.34.1

5 23

[PATCH 1/1] bootflow: always initialize bootflow_iter_set_dev parameters
by Heinrich Schuchardt 12 Apr '24

12 Apr '24

method_flags may be passed uninitialized to bootflow_iter_set_dev() if dev is not NULL. Always initialize method_flags. Addresses-Coverity-ID: 467057 Uninitialized scalar variable Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- boot/bootflow.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/boot/bootflow.c b/boot/bootflow.c index 68bf99329ab..f659a414c79 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -244,7 +244,7 @@ static int iter_incr(struct bootflow_iter *iter) if (iter->flags & BOOTFLOWIF_SINGLE_DEV) { ret = -ENOENT; } else { - int method_flags; + int method_flags = 0; ret = 0; dev = iter->dev; @@ -263,7 +263,6 @@ static int iter_incr(struct bootflow_iter *iter) } else if (IS_ENABLED(CONFIG_BOOTSTD_FULL) && iter->flags & BOOTFLOWIF_SINGLE_MEDIA) { log_debug("next in single\n"); - method_flags = 0; do { /* * Move to the next bootdev child of this media @@ -305,7 +304,6 @@ static int iter_incr(struct bootflow_iter *iter) } } else { ret = bootdev_next_prio(iter, &dev); - method_flags = 0; } } log_debug("ret=%d, dev=%p %s\n", ret, dev, -- 2.43.0

2 2

[PATCH] ARM: uniphier: Move uniphier_mem_map_init() call into dram_init()
by Kunihiko Hayashi 12 Apr '24

12 Apr '24

The function uniphier_mem_map_init() is to change global variable 'mem_map', which is referenced to get_page_table_size() to calculate the size of page table. However, uniphier_mem_map_init() is called after get_page_table_size(), so the size of page table and 'mem_map' become inconsist each other. After all, U-Boot fails to boot on chip with memory map different from default map, uniphier_mem_map_init() should be moved to dram_init(), which is called before get_page_table_size(). Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> --- arch/arm/mach-uniphier/dram_init.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c index 7f2753190c23..e6f1286e71fd 100644 --- a/arch/arm/mach-uniphier/dram_init.c +++ b/arch/arm/mach-uniphier/dram_init.c @@ -265,14 +265,15 @@ int dram_init(void) if (uniphier_get_soc_id() == UNIPHIER_LD20_ID) gd->ram_size -= 64; + /* map all the DRAM regions */ + uniphier_mem_map_init(gd->ram_base, prev_top - gd->ram_base); + return 0; } int dram_init_banksize(void) { struct uniphier_dram_map dram_map[3] = {}; - unsigned long base, top; - bool valid_bank_found = false; int ret, i; ret = uniphier_dram_map_get(dram_map); @@ -287,18 +288,7 @@ int dram_init_banksize(void) if (!dram_map[i].size) continue; - - if (!valid_bank_found) - base = dram_map[i].base; - top = dram_map[i].base + dram_map[i].size; - valid_bank_found = true; } - if (!valid_bank_found) - return -EINVAL; - - /* map all the DRAM regions */ - uniphier_mem_map_init(base, top - base); - return 0; } -- 2.25.1

2 1

[PATCH 1/1] disk: simplify print_part_header()
by Heinrich Schuchardt 12 Apr '24

12 Apr '24

Using uclass_get_name() reduces the code size. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- disk/part.c | 47 +++----------------------------------- test/py/tests/test_scsi.py | 2 +- 2 files changed, 4 insertions(+), 45 deletions(-) diff --git a/disk/part.c b/disk/part.c index 36b88205eca..65289a31e30 100644 --- a/disk/part.c +++ b/disk/part.c @@ -14,6 +14,7 @@ #include <malloc.h> #include <part.h> #include <ubifs_uboot.h> +#include <dm/uclass.h> #undef PART_DEBUG @@ -305,50 +306,8 @@ static void print_part_header(const char *type, struct blk_desc *desc) CONFIG_IS_ENABLED(ISO_PARTITION) || \ CONFIG_IS_ENABLED(AMIGA_PARTITION) || \ CONFIG_IS_ENABLED(EFI_PARTITION) - puts ("\nPartition Map for "); - switch (desc->uclass_id) { - case UCLASS_IDE: - puts ("IDE"); - break; - case UCLASS_AHCI: - puts ("SATA"); - break; - case UCLASS_SCSI: - puts ("SCSI"); - break; - case UCLASS_USB: - puts ("USB"); - break; - case UCLASS_MMC: - puts ("MMC"); - break; - case UCLASS_HOST: - puts ("HOST"); - break; - case UCLASS_NVME: - puts ("NVMe"); - break; - case UCLASS_PVBLOCK: - puts("PV BLOCK"); - break; - case UCLASS_RKMTD: - puts("RKMTD"); - break; - case UCLASS_VIRTIO: - puts("VirtIO"); - break; - case UCLASS_EFI_MEDIA: - puts("EFI"); - break; - case UCLASS_BLKMAP: - puts("BLKMAP"); - break; - default: - printf("UNKNOWN(%d)", desc->uclass_id); - break; - } - printf (" device %d -- Partition Type: %s\n\n", - desc->devnum, type); + printf("\nPartition Map for %s device %d -- Partition Type: %s\n\n", + uclass_get_name(desc->uclass_id), desc->devnum, type); #endif /* any CONFIG_..._PARTITION */ } diff --git a/test/py/tests/test_scsi.py b/test/py/tests/test_scsi.py index be2e283e7d2..445693cafd7 100644 --- a/test/py/tests/test_scsi.py +++ b/test/py/tests/test_scsi.py @@ -87,6 +87,6 @@ def test_scsi_dev(u_boot_console): def test_scsi_part(u_boot_console): test_scsi_dev(u_boot_console) output = u_boot_console.run_command('scsi part') - assert 'Partition Map for SCSI device' in output + assert 'Partition Map for scsi device' in output output = u_boot_console.run_command('echo $?') assert output.endswith('0') -- 2.43.0

2 1

[PATCH 1/1] test: remove unused import from pkg_resources
by Heinrich Schuchardt 12 Apr '24

12 Apr '24

load_entry_point is not used. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- test/py/test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/py/test.py b/test/py/test.py index 95859a66e29..7c477903d6b 100755 --- a/test/py/test.py +++ b/test/py/test.py @@ -11,7 +11,6 @@ import os import os.path import sys import pytest -from pkg_resources import load_entry_point if __name__ == '__main__': # argv; py.test test_directory_name user-supplied-arguments -- 2.43.0

2 1

[PATCH] fdt: Fix fdt_pack_reg() on 64-bit platforms
by Sam Protsenko 12 Apr '24

12 Apr '24

When "memory" node is being processed in fdt_pack_reg() on ARM64 platforms, an unaligned bus access might happen, which leads to "synchronous abort" CPU exception. Consider next dts example: / { #address-cells = <2>; #size-cells = <1>; memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x3ab00000>, <0x0 0xc0000000 0x40000000>, <0x8 0x80000000 0x80000000>; }; }; After fdt_pack_reg() reads the first addr/size entry from such memory node, the "p" pointer becomes 12 bytes shifted from its original value (8 bytes for two address cells + 4 bytes for one size cell). So now it's not 64-bit aligned, and an attempt to do 64-bit bus access to that address will cause an abort like this: "Synchronous Abort" handler, esr 0x96000021, far 0xba235efc This issue was originally reported by David Virag [1] who observed it happening on Samsung Exynos7885 SoC (ARM64), and later the same issue was observed on Samsung Exynos850 (ARM64). Fix the issue by using put_unaligned_be64() helper, which takes care of possible unaligned 64-bit accesses. That solution was proposed by Simon Glass in the original thread [1]. [1] https://lists.denx.de/pipermail/u-boot/2023-July/522074.html Fixes: 739a01ed8e02 ("fdt_support: fix an endian bug of fdt_fixup_memory_banks") Suggested-by: Simon Glass <sjg(a)google.com> Reported-by: David Virag <virag.david003(a)gmail.com> Closes: https://lists.denx.de/pipermail/u-boot/2023-July/522074.html Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- boot/fdt_support.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/boot/fdt_support.c b/boot/fdt_support.c index 090d82ee80a5..9844c70be806 100644 --- a/boot/fdt_support.c +++ b/boot/fdt_support.c @@ -17,6 +17,7 @@ #include <linux/ctype.h> #include <linux/types.h> #include <asm/global_data.h> +#include <asm/unaligned.h> #include <linux/libfdt.h> #include <fdt_support.h> #include <exports.h> @@ -421,13 +422,13 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size, for (i = 0; i < n; i++) { if (address_cells == 2) - *(fdt64_t *)p = cpu_to_fdt64(address[i]); + put_unaligned_be64(address[i], p); else *(fdt32_t *)p = cpu_to_fdt32(address[i]); p += 4 * address_cells; if (size_cells == 2) - *(fdt64_t *)p = cpu_to_fdt64(size[i]); + put_unaligned_be64(size[i], p); else *(fdt32_t *)p = cpu_to_fdt32(size[i]); p += 4 * size_cells; -- 2.39.2

3 2

[PATCH 1/1] cli: always show cursor
by Heinrich Schuchardt 12 Apr '24

12 Apr '24

We may enter the command line interface in a state where on the remote console the cursor is not shown. Send an escape sequence to enable it. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- common/cli.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/cli.c b/common/cli.c index a34938294ec..1c33daf1149 100644 --- a/common/cli.c +++ b/common/cli.c @@ -11,6 +11,7 @@ #define pr_fmt(fmt) "cli: %s: " fmt, __func__ #include <common.h> +#include <ansi.h> #include <bootstage.h> #include <cli.h> #include <cli_hush.h> @@ -336,4 +337,7 @@ void cli_init(void) #if defined(CONFIG_HUSH_INIT_VAR) hush_init_var(); #endif + + if (CONFIG_IS_ENABLED(VIDEO_ANSI)) + printf(ANSI_CURSOR_SHOW "\n"); } -- 2.43.0

2 1

[PATCH 1/2] part: Check all partitions in part_get_info_by_name()
by Sam Protsenko 12 Apr '24

12 Apr '24

In part_get_info_by_name() the inability to get some partition info shouldn't be a reason for dropping out of the loop. That might happen e.g. if the partition is hidden or unused. An example of such case are Samsung devices, where they use the "unused" GUID type (00000000-0000-0000-0000-000000000000) to indicate that the partition should be hidden from the OS. Such partitions might not be seen in "part list" output, which creates "gaps" in numbering in between of the visible partitions: Part Start LBA End LBA Name 1 0x00000400 0x0000a3ff "efs" 5 0x00026420 0x00026c1f "dtbo" 12 0x0003f390 0x0074738f "super" In that case, the loop in part_get_info_by_name() would break after partition #1, so any attempt to obtain "dtbo" or "super" partition will fail. Fix that by continuing to iterate over the remaining partitions to make sure none of the visible ones is missed. That makes "part" command (e.g. "part start", "part size") able to work with such tables. Fixes: 87b8530fe244 ("disk: part: implement generic function part_get_info_by_name()") Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- disk/part.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/disk/part.c b/disk/part.c index 36b88205eca7..08c9331e059c 100644 --- a/disk/part.c +++ b/disk/part.c @@ -717,8 +717,11 @@ int part_get_info_by_name(struct blk_desc *desc, const char *name, for (i = 1; i < part_drv->max_entries; i++) { ret = part_drv->get_info(desc, i, info); if (ret != 0) { - /* no more entries in table */ - break; + /* + * Partition with this index can't be obtained, but + * further partitions might be, so keep checking. + */ + continue; } if (strcmp(name, (const char *)info->name) == 0) { /* matched */ -- 2.39.2

3 5

Fwd: New Defects reported by Coverity Scan for Das U-Boot
by Tom Rini 12 Apr '24

12 Apr '24

Hey all, Here's the latest Coverity scan report. ---------- Forwarded message --------- From: <scan-admin(a)coverity.com> Date: Mon, Jan 22, 2024 at 6:26 PM Subject: New Defects reported by Coverity Scan for Das U-Boot To: <tom.rini(a)gmail.com> Hi, Please find the latest report on new defect(s) introduced to Das U-Boot found with Coverity Scan. 1 new defect(s) introduced to Das U-Boot found with Coverity Scan. 7 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 1 of 1 defect(s) ** CID 478860: Code maintainability issues (UNUSED_VALUE) /tools/image-host.c: 359 in fit_image_read_key_iv_data() ________________________________________________________________________________________________________ *** CID 478860: Code maintainability issues (UNUSED_VALUE) /tools/image-host.c: 359 in fit_image_read_key_iv_data() 353 if (ret >= sizeof(filename)) { 354 printf("Can't format the key or IV filename when setting up the cipher: insufficient buffer space\n"); 355 ret = -1; 356 } 357 if (ret < 0) { 358 printf("Can't format the key or IV filename when setting up the cipher: snprintf error\n"); >>> CID 478860: Code maintainability issues (UNUSED_VALUE) >>> Assigning value "-1" to "ret" here, but that stored value is overwritten before it can be used. 359 ret = -1; 360 } 361 362 ret = fit_image_read_data(filename, key_iv_data, expected_size); 363 364 return ret; ----- End forwarded message ----- -- Tom

3 5