November 2022 - U-Boot

[PATCH] fs: ext4: Fix dereferencing the null pointer 'ptr'
by Mikhail Ilin 23 Nov '22

23 Nov '22

If memory allocation fails on line 780, then 'fail' will be jumped to and 'ptr' will be null, causing it to be dereferenced it on line 855. Thus, before using 'ptr[i]' one must make sure that the 'ptr' pointer is not NULL. Fixes: 934b14f2bb30 ("ext4: free allocations by parse_path()") Signed-off-by: Mikhail Ilin <ilin.mikhail.ol(a)gmail.com> --- fs/ext4/ext4_common.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 1185cb2c04..3cdd1a04a9 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -851,10 +851,12 @@ end: fail: free(depth_dirname); free(parse_dirname); - for (i = 0; i < depth; i++) { - if (!ptr[i]) - break; - free(ptr[i]); + if (ptr) { + for (i = 0; i < depth; i++) { + if (!ptr[i]) + break; + free(ptr[i]); + } } free(ptr); free(parent_inode); -- 2.17.1

2 1

[PATCH v10 0/7] eficonfig: add UEFI Secure Boot key maintenance interface
by Masahisa Kojima 23 Nov '22

23 Nov '22

This series adds the UEFI Secure Boot key maintenance interface to the eficonfig command. User can enroll PK, KEK, db and dbx. Source code can be cloned with: $ git clone https://git.linaro.org/people/masahisa.kojima/u-boot.git -b kojima/eficonfig_sbkey_v10 [major changes] -rebase to v2023.01-rc1 Masahisa Kojima (7): eficonfig: refactor file selection handling eficonfig: expose append entry function eficonfig: refactor change boot order implementation eficonfig: expose eficonfig_create_device_path() eficonfig: use protocol interface for file selection eficonfig: add UEFI Secure Boot Key enrollment interface eficonfig: add "Show Signature Database" menu entry cmd/Makefile | 5 + cmd/eficonfig.c | 234 ++++---- cmd/eficonfig_sbkey.c | 498 ++++++++++++++++++ include/efi_config.h | 13 +- .../py/tests/test_eficonfig/test_eficonfig.py | 1 + 5 files changed, 632 insertions(+), 119 deletions(-) create mode 100644 cmd/eficonfig_sbkey.c -- 2.17.1

2 9

[PATCH v4 0/2] automatically strip btool_ from btool names
by Quentin Schulz 23 Nov '22

23 Nov '22

Commit daa2da754afe ("binman: btool: gzip: fix packer name so that binary can be found") introduced some sort of work-around to make the gzip binary found by bintool. However, this work-around would need to be applied to any btool whose name is prefixed with btool_ (usually to avoid conflict with other python modules). Instead, let's handle this specific case directly inside bintool so that the btools don't have to handle it themselves. This also reverts the now-unnecessary work-around for gzip btool. To: Simon Glass <sjg(a)chromium.org> To: Alper Nebi Yasak <alpernebiyasak(a)gmail.com> Cc: Quentin Schulz <foss+uboot(a)0leil.net> Cc: u-boot(a)lists.denx.de Signed-off-by: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> --- Changes in v4: - fix buildman test by enforcing class name to be Bintool<packer> even for Bintools in files whose filename is prefixed with btool_, - Link to v3: https://lore.kernel.org/r/20220930-upstream-gzip-binman-v3-v3-0-17c99d6d87a… --- Quentin Schulz (2): binman: bintool: remove btool_ prefix from btool names Revert "binman: btool: gzip: fix packer name so that binary can be found" tools/binman/bintool.py | 3 ++- tools/binman/btool/btool_gzip.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) --- base-commit: 898bd53e6a930080cee7cd7b1a09120c4dfd9467 change-id: 20220930-upstream-gzip-binman-v3-91b83bf16795 Best regards, -- Quentin Schulz <quentin.schulz(a)theobroma-systems.com>

2 6

[PATCH 1/1] sandbox: check lseek return value in handle_ufi_command
by Heinrich Schuchardt 23 Nov '22

23 Nov '22

Invoking lseek() may result in an error. Handle it. Addresses-Coverity-ID: 376212 ("Error handling issues (CHECKED_RETURN)") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/usb/emul/sandbox_flash.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c index 6e8cfe1650..01ccc4bc17 100644 --- a/drivers/usb/emul/sandbox_flash.c +++ b/drivers/usb/emul/sandbox_flash.c @@ -188,15 +188,19 @@ static int handle_ufi_command(struct sandbox_flash_priv *priv, const void *buff, struct scsi_emul_info *info = &priv->eminfo; const struct scsi_cmd *req = buff; int ret; + off_t offset; ret = sb_scsi_emul_command(info, req, len); if (!ret) { setup_response(priv); } else if ((ret == SCSI_EMUL_DO_READ || ret == SCSI_EMUL_DO_WRITE) && priv->fd != -1) { - os_lseek(priv->fd, info->seek_block * info->block_size, - OS_SEEK_SET); - setup_response(priv); + offset = os_lseek(priv->fd, info->seek_block * info->block_size, + OS_SEEK_SET); + if (offset == (off_t)-1) + setup_fail_response(priv); + else + setup_response(priv); } else { setup_fail_response(priv); } -- 2.37.2

2 1

[PATCH] sandbox: Move the capsule GUID declarations to board file
by Sughosh Ganu 23 Nov '22

23 Nov '22

The sandbox config file is to be removed. Move the GUID declarations needed for capsule update functionality to the board file where they are used. Signed-off-by: Sughosh Ganu <sughosh.ganu(a)linaro.org> --- board/sandbox/sandbox.c | 13 +++++++++++++ include/configs/sandbox.h | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 4d89f9be1c..4c655dfd49 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -30,6 +30,19 @@ gd_t *gd; #if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +/* GUIDs for capsule updatable firmware images */ +#define SANDBOX_UBOOT_IMAGE_GUID \ + EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \ + 0x08, 0x46, 0x9b, 0x7f, 0xe9, 0xc8) + +#define SANDBOX_UBOOT_ENV_IMAGE_GUID \ + EFI_GUID(0x5a7021f5, 0xfef2, 0x48b4, 0xaa, 0xba, \ + 0x83, 0x2e, 0x77, 0x74, 0x18, 0xc0) + +#define SANDBOX_FIT_IMAGE_GUID \ + EFI_GUID(0x3673b45d, 0x6a7c, 0x46f3, 0x9e, 0x60, \ + 0xad, 0xab, 0xb0, 0x3f, 0x79, 0x37) + struct efi_fw_image fw_images[] = { #if defined(CONFIG_EFI_CAPSULE_FIRMWARE_RAW) { diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 5168e2fa35..0dcb2ebc31 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -10,19 +10,6 @@ #define CONFIG_MALLOC_F_ADDR 0x0010000 -/* GUIDs for capsule updatable firmware images */ -#define SANDBOX_UBOOT_IMAGE_GUID \ - EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \ - 0x08, 0x46, 0x9b, 0x7f, 0xe9, 0xc8) - -#define SANDBOX_UBOOT_ENV_IMAGE_GUID \ - EFI_GUID(0x5a7021f5, 0xfef2, 0x48b4, 0xaa, 0xba, \ - 0x83, 0x2e, 0x77, 0x74, 0x18, 0xc0) - -#define SANDBOX_FIT_IMAGE_GUID \ - EFI_GUID(0x3673b45d, 0x6a7c, 0x46f3, 0x9e, 0x60, \ - 0xad, 0xab, 0xb0, 0x3f, 0x79, 0x37) - /* Size of our emulated memory */ #define SB_CONCAT(x, y) x ## y #define SB_TO_UL(s) SB_CONCAT(s, UL) -- 2.34.1

2 2

[PATCH v2 1/2] cmd: fdt: Fix iteration over elements above index 1 in fdt get
by Marek Vasut 23 Nov '22

23 Nov '22

Always increment both the iterator and pointer into the string property value by length of the current element + 1 (to cater for the string delimiter), otherwise the element extracted from the string property value would be extracted from an offset that is multiple of the length of the first element, instead of sum of element lengths until select index. This fixes 'fdt get value' operation for index above 1 (counting from index 0). Acked-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> Fixes: 13982ced2cc ("cmd: fdt: Add support for reading stringlist property values") Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- V2: - Update commit message, use index above 1 and clarify the counting is zero-based - Add AB from Heinrich --- cmd/fdt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/fdt.c b/cmd/fdt.c index 4b2dcfec863..8e51a431261 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -60,11 +60,14 @@ static int fdt_value_env_set(const void *nodep, int len, * Iterate over all members in stringlist and find the one at * offset $index. If no such index exists, indicate failure. */ - for (i = 0; i < len; i += strlen(nodec) + 1) { - if (index-- > 0) + for (i = 0; i < len; ) { + if (index-- > 0) { + i += strlen(nodec) + 1; + nodec += strlen(nodec) + 1; continue; + } - env_set(var, nodec + i); + env_set(var, nodec); return 0; } -- 2.35.1

2 3

Re: U-Boot SPL not getting generated
by Venkatakrishnan S ic11539 23 Nov '22

23 Nov '22

Hi, I am trying to generate u-boot spl for a custom processor based out of risc-v arch. I have done the defconfig for u-boot proper and is working now. I am able to use that alone with opensbi. I am trying to generate u-boot spl for the same board and I am not able to generate it despite adding the config option in the defconfig for the board. The options enabled/added for u-boot spl are : CONFIG_SPL_DM_SPI=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_BUILD=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80000000 CONFIG_SPL_CLK=y Thanks in advance. Regards, Venkatakrishnan Sutharsan

2 3

[PATCH] test: Disable part of the setexpr test for now
by Simon Glass 22 Nov '22

22 Nov '22

This fails in CI for unknown reasons. Disable the last assert for now. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- test/cmd/setexpr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/cmd/setexpr.c b/test/cmd/setexpr.c index 0dc94f7e61b..312593e1e32 100644 --- a/test/cmd/setexpr.c +++ b/test/cmd/setexpr.c @@ -308,7 +308,11 @@ static int setexpr_test_str(struct unit_test_state *uts) start_mem = ut_check_free(); ut_assertok(run_command("setexpr.s fred *0", 0)); ut_asserteq_str("hello", env_get("fred")); - ut_assertok(ut_check_delta(start_mem)); + /* + * This fails in CI at present. + * + * ut_assertok(ut_check_delta(start_mem)); + */ unmap_sysmem(buf); -- 2.38.1.584.g0f3c55d4c2-goog

1 0

[GIT PULL] xilinx patches for v2023.01-rc3
by Michal Simek 22 Nov '22

22 Nov '22

Hi Tom, please pull the following patches to your tree. I can't see any build issue from buildman and gitlab CI looks also good. https://source.denx.de/u-boot/custodians/u-boot-microblaze/-/pipelines/14191 Thanks, Michal The following changes since commit 16e49a14b2af1421cbaeefb9ce8ee863e45fd71b: Prepare v2023.01-rc2 (2022-11-21 12:33:14 -0500) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2023.01-rc3 for you to fetch changes up to 3655dd22a4c219d0ee69dc4a29e5553c1a1bb5d7: arm64: versal: Add octal spi flash mini u-boot configuration (2022-11-22 15:02:07 +0100) ---------------------------------------------------------------- Xilinx changes for v2023.01-rc3 microblaze: - Enable 32 bit addressing mode for SPIs zynq: - Minor DT fixes (PL clock enabling) zynqmp: - Disable watchdog by default - Remove unused xlnx,eeprom chosen support - Add missing symlink for vck190 SC revB - Use mdio bus with ethernet-phy-id description versal: - Add mini qspi/ospi configuration versal-net: - Add soc driver - Fix Kconfig entry for SOC - Fix loading address location for MINI configuration - Disable LMB for mini configuration net: - Fix ethernet-phy-id usage in the code pinctrl: - Revert high impedance/output enable support timer: - Fix timer relocation for Microblaze - Fix timer wrap in 32bit Xilinx timer driver ---------------------------------------------------------------- Ashok Reddy Soma (4): qspi: versal-net: Add condition for tapdelay register arm64: versal: Add qspi flash mini u-boot configuration spi: cadence-qspi: Fix compilation error in mini u-boot flash reset arm64: versal: Add octal spi flash mini u-boot configuration Christian Kohn (1): ARM: zynq: DT: Enable all FCLKs by default Michal Simek (9): arm64: zynqmp: Disable watchdog by default for virt platform Revert "pinctrl: zynqmp: Add support for output-enable and bias-high-impedance" net: phy: Fix ethernet-phy-id <dot> in the code arm64: zynqmp: Create vck190 spl link for revB xilinx: versal-net: Fix incorrect platform name in Kconfig xilinx: versal-net: Fix SYS_LOAD_ADDR to point to OCM arm64: zynqmp: Describe TI phy as ethernet-phy-id with reset on zcu106 xilinx: versal-net: Disable LMB for mini configuration soc: xilinx: versal-net: Add soc_xilinx_versal_net driver Ovidiu Panait (3): timer-uclass: add timer_get_ops() macro timer-uclass: relocate ops pointers for CONFIG_NEEDS_MANUAL_RELOC timer: xilinx-timer: use timer_conv_64() to fix timer wrap around T Karthik Reddy (1): microblaze: Make extended addressing support default Venkatesh Yadav Abbarapu (1): xilinx: common: Remove zynq_board_read_rom_ethaddr() MAINTAINERS | 1 + arch/arm/Kconfig | 2 +- arch/arm/dts/Makefile | 2 + arch/arm/dts/versal-mini-ospi-single.dts | 16 ++++ arch/arm/dts/versal-mini-ospi.dtsi | 77 +++++++++++++++++++ arch/arm/dts/versal-mini-qspi-single.dts | 16 ++++ arch/arm/dts/versal-mini-qspi.dtsi | 72 ++++++++++++++++++ arch/arm/dts/zynq-7000.dtsi | 2 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 19 +++-- arch/arm/mach-versal-net/cpu.c | 5 ++ arch/arm/mach-zynq/include/mach/sys_proto.h | 2 - arch/arm/mach-zynqmp/include/mach/sys_proto.h | 1 - board/xilinx/common/board.c | 28 ------- board/xilinx/zynqmp/zynqmp-e-a2197-00-revB | 1 + configs/microblaze-generic_defconfig | 1 + configs/xilinx_versal_mini_ospi_defconfig | 72 ++++++++++++++++++ configs/xilinx_versal_mini_qspi_defconfig | 75 +++++++++++++++++++ configs/xilinx_versal_net_mini_defconfig | 3 +- configs/xilinx_versal_net_virt_defconfig | 2 + configs/xilinx_zynqmp_virt_defconfig | 2 - drivers/core/ofnode.c | 4 +- drivers/net/zynq_gem.c | 16 ---- drivers/pinctrl/pinctrl-zynqmp.c | 9 --- drivers/soc/Kconfig | 8 ++ drivers/soc/Makefile | 1 + drivers/soc/soc_xilinx_versal_net.c | 78 ++++++++++++++++++++ drivers/spi/cadence_ospi_versal.c | 4 +- drivers/spi/zynqmp_gqspi.c | 3 +- drivers/timer/timer-uclass.c | 16 +++- drivers/timer/xilinx-timer.c | 2 +- include/timer.h | 2 + 31 files changed, 468 insertions(+), 74 deletions(-) create mode 100644 arch/arm/dts/versal-mini-ospi-single.dts create mode 100644 arch/arm/dts/versal-mini-ospi.dtsi create mode 100644 arch/arm/dts/versal-mini-qspi-single.dts create mode 100644 arch/arm/dts/versal-mini-qspi.dtsi create mode 120000 board/xilinx/zynqmp/zynqmp-e-a2197-00-revB create mode 100644 configs/xilinx_versal_mini_ospi_defconfig create mode 100644 configs/xilinx_versal_mini_qspi_defconfig create mode 100644 drivers/soc/soc_xilinx_versal_net.c -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs

2 1

Pull request for efi-2023-01-rc2-2
by Heinrich Schuchardt 22 Nov '22

22 Nov '22

Dear Tom, The following changes since commit 16e49a14b2af1421cbaeefb9ce8ee863e45fd71b: Prepare v2023.01-rc2 (2022-11-21 12:33:14 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2023-01-rc2-2 for you to fetch changes up to d0f9ae35fb25d732184b8b307a72c7e20b960353: eficonfig: add "Show Signature Database" menu entry (2022-11-22 12:00:45 +0100) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/14186 ---------------------------------------------------------------- Pull request for efi-2023-01-rc2-2 UEFI: * add UEFI Secure Boot Key enrollment interface to eficonfig command * fix buffer underflow in FatToStr() implementation ---------------------------------------------------------------- Heinrich Schuchardt (3): efi_selftest: unsigned char parameter for efi_st_strcmp_16_8() efi_selftest: Improve the FatToStr() unit test doc: in cmp man-page replace 'tuples' by 'values' Masahisa Kojima (7): eficonfig: refactor file selection handling eficonfig: expose append entry function eficonfig: refactor change boot order implementation eficonfig: expose eficonfig_create_device_path() eficonfig: use protocol interface for file selection eficonfig: add UEFI Secure Boot Key enrollment interface eficonfig: add "Show Signature Database" menu entry Mikhail Ilin (1): efi_loader: Fix buffer underflow cmd/Makefile | 5 + cmd/eficonfig.c | 234 +++++----- cmd/eficonfig_sbkey.c | 498 ++++++++++++++++++++++ doc/usage/cmd/cmp.rst | 12 +- include/efi_config.h | 13 +- include/efi_selftest.h | 2 +- lib/efi_loader/efi_unicode_collation.c | 2 +- lib/efi_selftest/efi_selftest_unicode_collation.c | 12 + lib/efi_selftest/efi_selftest_util.c | 2 +- test/py/tests/test_eficonfig/test_eficonfig.py | 1 + 10 files changed, 653 insertions(+), 128 deletions(-) create mode 100644 cmd/eficonfig_sbkey.c

2 1