Skip to contentSkip to conversation

Fuzzing and ASAN for sandbox

PATCH In review Andrew Scull 4 participants 18 messages May 30, 2022 – Aug 28, 2023

Subsystems (19)
lore
Share & tools
lore
#0 lore raw

v3 cover Fuzzing and ASAN for sandbox

This series introduces ASAN and a basic fuzzing infrastructure that works with sandbox. The example fuzz test towards the end of the series will find something pretty quickly. That something is fixed by the series "virtio: Harden and test vring" that needs to be applied for the final patch in this series.

There is some refactoring to stop using '.' prefixed sections. ELF defines sections with names that contain anything that isn't alphanumeric or an underscore as being for system use which means clang's ASAN instrumentation happily add redzones between the contained objects. That's not what we want for things like linker lists where the linker script has carefully placed the sections contiguously. By renaming the sections, clang sees them as user sections and doesn't add instrumentation.

ASAN is left disabled by default as there are still some tests that it triggers on and will need some more investigation to fix. It can be enabled with CONFIG_ASAN or passing -a ASAN to buildman.

I abandonded the previous attempts to refactor sandbox EFI and getopt declaration as the changes resulted in problems out of the scope of this CL. I haven't tried to understand what EFI on sandbox should look like, but I have found that the linker list implementation is very brittle when up against compiler optimisation since ef123c5253 started to use static, zero-length arrays to mark the beginning and end of lists but the compiler see this as something it can get rid of.

From v1:
- corrected handling of EFI symbols by sandbox linker script
- per comments, some renaming and explaining
- dropped RFC for dlmalloc ASAN instrumentation (work required to improve it)
- added patch to reduce logging noise in fuzzer

From v2:
- remove sandbox EFI and getopt refactoring, they obstruct the series
- resolve a couple more ASAN errors
- fix LTO, xtensa and MIPS builds
- add ASAN build targets for CI

Andrew Scull (13):
serial: sandbox: Fix buffer underflow in puts
sandbox: Rename EFI runtime sections
sandbox: Rename getopt sections
linker_lists: Rename sections to remove . prefix
sandbox: Add support for Address Sanitizer test/py: test_stackprotector: Disable for ASAN
CI: Azure: Build with ASAN enabled
fuzzing_engine: Add fuzzing engine uclass
test: fuzz: Add framework for fuzzing
sandbox: Decouple program entry from sandbox init
sandbox: Add libfuzzer integration
sandbox: Implement fuzzing engine driver
fuzz: virtio: Add fuzzer for vring

 .azure-pipelines.yml                          |  6 ++
 Kconfig                                       | 16 ++++
 arch/Kconfig                                  |  2 +
 arch/arc/cpu/u-boot.lds                       |  4 +-
 arch/arm/config.mk                            |  4 +-
 arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds   |  4 +-
 arch/arm/cpu/armv7/sunxi/u-boot-spl.lds       |  4 +-
 arch/arm/cpu/armv8/u-boot-spl.lds             |  4 +-
 arch/arm/cpu/armv8/u-boot.lds                 |  4 +-
 arch/arm/cpu/u-boot-spl.lds                   |  4 +-
 arch/arm/cpu/u-boot.lds                       |  6 +-
 arch/arm/mach-at91/arm926ejs/u-boot-spl.lds   |  2 +-
 arch/arm/mach-at91/armv7/u-boot-spl.lds       |  2 +-
 arch/arm/mach-omap2/u-boot-spl.lds            |  4 +-
 arch/arm/mach-orion5x/u-boot-spl.lds          |  4 +-
 arch/arm/mach-rockchip/u-boot-tpl-v8.lds      |  4 +-
 arch/arm/mach-zynq/u-boot-spl.lds             |  4 +-
 arch/arm/mach-zynq/u-boot.lds                 |  4 +-
 arch/m68k/cpu/u-boot.lds                      |  4 +-
 arch/microblaze/cpu/u-boot-spl.lds            |  4 +-
 arch/microblaze/cpu/u-boot.lds                |  4 +-
 arch/mips/config.mk                           |  2 +-
 arch/mips/cpu/u-boot-spl.lds                  |  4 +-
 arch/mips/cpu/u-boot.lds                      |  4 +-
 arch/nios2/cpu/u-boot.lds                     |  4 +-
 arch/powerpc/cpu/mpc83xx/u-boot.lds           |  4 +-
 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds       |  4 +-
 arch/powerpc/cpu/mpc85xx/u-boot.lds           |  4 +-
 arch/riscv/cpu/u-boot-spl.lds                 |  4 +-
 arch/riscv/cpu/u-boot.lds                     |  4 +-
 arch/sandbox/config.mk                        | 21 ++++-
 arch/sandbox/cpu/os.c                         | 76 +++++++++++++++++
 arch/sandbox/cpu/start.c                      |  2 +-
 arch/sandbox/cpu/u-boot-spl.lds               | 10 +--
 arch/sandbox/cpu/u-boot.lds                   | 32 ++++----
 arch/sandbox/dts/test.dts                     |  4 +
 arch/sandbox/include/asm/fuzzing_engine.h     | 25 ++++++
 arch/sandbox/include/asm/getopt.h             |  2 +-
 arch/sandbox/include/asm/main.h               | 18 ++++
 arch/sandbox/include/asm/sections.h           |  4 +-
 arch/sandbox/lib/sections.c                   |  8 +-
 arch/sh/cpu/u-boot.lds                        |  4 +-
 arch/x86/cpu/u-boot-64.lds                    |  6 +-
 arch/x86/cpu/u-boot-spl.lds                   |  6 +-
 arch/x86/cpu/u-boot.lds                       |  6 +-
 arch/x86/lib/elf_ia32_efi.lds                 |  4 +-
 arch/x86/lib/elf_x86_64_efi.lds               |  4 +-
 arch/xtensa/cpu/u-boot.lds                    |  4 +-
 arch/xtensa/include/asm/ldscript.h            | 13 ++-
 board/compulab/cm_t335/u-boot.lds             |  4 +-
 board/cssi/MCR3000/u-boot.lds                 |  4 +-
 .../davinci/da8xxevm/u-boot-spl-da850evm.lds  |  2 +-
 board/qualcomm/dragonboard820c/u-boot.lds     |  4 +-
 board/samsung/common/exynos-uboot-spl.lds     |  4 +-
 board/synopsys/iot_devkit/u-boot.lds          |  4 +-
 board/ti/am335x/u-boot.lds                    |  4 +-
 board/vscom/baltos/u-boot.lds                 |  4 +-
 doc/api/linker_lists.rst                      | 22 ++---
 doc/develop/commands.rst                      |  4 +-
 doc/develop/driver-model/of-plat.rst          |  4 +-
 drivers/Kconfig                               |  2 +
 drivers/Makefile                              |  1 +
 drivers/fuzz/Kconfig                          | 17 ++++
 drivers/fuzz/Makefile                         |  8 ++
 drivers/fuzz/fuzzing_engine-uclass.c          | 28 +++++++
 drivers/fuzz/sandbox_fuzzing_engine.c         | 35 ++++++++
 drivers/serial/sandbox.c                      |  2 +-
 include/dm/uclass-id.h                        |  1 +
 include/fuzzing_engine.h                      | 51 ++++++++++++
 include/linker_lists.h                        | 18 ++--
 include/test/fuzz.h                           | 51 ++++++++++++
 test/Makefile                                 |  1 +
 test/fuzz/Makefile                            |  8 ++
 test/fuzz/cmd_fuzz.c                          | 82 +++++++++++++++++++
 test/fuzz/virtio.c                            | 72 ++++++++++++++++
 test/py/tests/test_stackprotector.py          |  1 +
 tools/mips-relocs.c                           |  9 +-
 77 files changed, 673 insertions(+), 151 deletions(-)
 create mode 100644 arch/sandbox/include/asm/fuzzing_engine.h
 create mode 100644 arch/sandbox/include/asm/main.h
 create mode 100644 drivers/fuzz/Kconfig
 create mode 100644 drivers/fuzz/Makefile
 create mode 100644 drivers/fuzz/fuzzing_engine-uclass.c
 create mode 100644 drivers/fuzz/sandbox_fuzzing_engine.c
 create mode 100644 include/fuzzing_engine.h
 create mode 100644 include/test/fuzz.h
 create mode 100644 test/fuzz/Makefile
 create mode 100644 test/fuzz/cmd_fuzz.c
 create mode 100644 test/fuzz/virtio.c
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#1 lore raw

PATCH v3 1/13 serial: sandbox: Fix buffer underflow in puts

Fix the buffer underflow that would occur if puts is called with length of zero.

Fixes efa51f2bd64 ("serial: sandbox: Implement puts")
Cc Sean Anderson <[email protected]>
Cc Simon Glass <[email protected]>
---
 drivers/serial/sandbox.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/serial/sandbox.c +1 -1
index e726e19c46..13b54921c4 100644
@@ -114,7 +114,7 @@ static ssize_t sandbox_serial_puts(struct udevice *dev, const char *s,
 	struct sandbox_serial_priv *priv = dev_get_priv(dev);
 	ssize_t ret;
 
-	if (s[len - 1] == '\n')
+	if (len && s[len - 1] == '\n')
 		priv->start_of_line = true;
 
 	if (sandbox_serial_enabled) {
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#5 lore raw

PATCH v3 3/13 sandbox: Rename getopt sections

In reply to Andrew Scull

Rename the sections used for defining sandbox command line options so that they don't start with a '.'. ELF says that sections starting with a '.' are reserved for system use, but the sandbox runs as a normal user process so should be using user sections instead.

Clang's ASAN adds redzones to non-user sections and the extra padding meant that the list of options was being corrupted. Naming the sections as user sections avoids this issue as clang handles them as we intended.

---
 arch/sandbox/cpu/u-boot-spl.lds     | 6 +++---
 arch/sandbox/cpu/u-boot.lds         | 6 +++---
 arch/sandbox/include/asm/getopt.h   | 2 +-
 arch/sandbox/include/asm/sections.h | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)
arch/sandbox/cpu/u-boot-spl.lds +3 -3
index 206e265e74..6b300bcc93 100644
@@ -22,9 +22,9 @@ SECTIONS
 	}
 
 	_u_boot_sandbox_getopt : {
-		*(.u_boot_sandbox_getopt_start)
-		KEEP(*(.u_boot_sandbox_getopt))
-		*(.u_boot_sandbox_getopt_end)
+		*(_u_boot_sandbox_getopt_start)
+		KEEP(*(_u_boot_sandbox_getopt))
+		*(_u_boot_sandbox_getopt_end)
 	}
 }
 
arch/sandbox/cpu/u-boot.lds +3 -3
index d2cb12fc29..1f89a3329e 100644
@@ -14,9 +14,9 @@ SECTIONS
 	}
 
 	_u_boot_sandbox_getopt : {
-		*(.u_boot_sandbox_getopt_start)
-		*(.u_boot_sandbox_getopt)
-		*(.u_boot_sandbox_getopt_end)
+		*(_u_boot_sandbox_getopt_start)
+		*(_u_boot_sandbox_getopt)
+		*(_u_boot_sandbox_getopt_end)
 	}
 
 	efi_runtime_start : {
arch/sandbox/include/asm/getopt.h +1 -1
index d2145ad6e2..df30572d6c 100644
@@ -44,7 +44,7 @@ struct sandbox_cmdline_option {
 		.callback = sandbox_cmdline_cb_##f, \
 	}; \
 	/* Ppointer to the struct in a special section for the linker script */ \
-	static __used __section(".u_boot_sandbox_getopt") \
+	static __used __section("_u_boot_sandbox_getopt") \
 		struct sandbox_cmdline_option \
 			*sandbox_cmdline_option_##f##_ptr = \
 			&sandbox_cmdline_option_##f
arch/sandbox/include/asm/sections.h +2 -2
index f4351ae7db..88837bb35c 100644
@@ -17,7 +17,7 @@ static inline struct sandbox_cmdline_option **
 __u_boot_sandbox_option_start(void)
 {
 	static char start[0] __aligned(4) __attribute__((unused))
-		__section(".u_boot_sandbox_getopt_start");
+		__section("_u_boot_sandbox_getopt_start");
 
 	return (struct sandbox_cmdline_option **)&start;
 }
@@ -26,7 +26,7 @@ static inline struct sandbox_cmdline_option **
 __u_boot_sandbox_option_end(void)
 {
 	static char end[0] __aligned(4) __attribute__((unused))
-		__section(".u_boot_sandbox_getopt_end");
+		__section("_u_boot_sandbox_getopt_end");
 
 	return (struct sandbox_cmdline_option **)&end;
 }
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#4 lore raw

PATCH v3 2/13 sandbox: Rename EFI runtime sections

In reply to Andrew Scull

Rename the sections used for placing the EFI runtime so that they don't start with a '.'. ELF says that sections starting with a '.' are reserved for system use, but the sandbox runs as a normal user process so should be using user sections instead.

Clang's ASAN adds redzones to non-user sections and the extra padding meant that the list of options was being corrupted. Naming the sections as user sections avoids this issue as clang handles them as we intended.

---
 arch/sandbox/cpu/u-boot.lds | 22 ++++++++++------------
 arch/sandbox/lib/sections.c |  8 ++++----
 2 files changed, 14 insertions(+), 16 deletions(-)
arch/sandbox/cpu/u-boot.lds +10 -12
index 92e834a8d2..d2cb12fc29 100644
@@ -19,32 +19,30 @@ SECTIONS
 		*(.u_boot_sandbox_getopt_end)
 	}
 
-	.__efi_runtime_start : {
-		*(.__efi_runtime_start)
+	efi_runtime_start : {
+		*(___efi_runtime_start)
 	}
 
-	.efi_runtime : {
+	efi_runtime : {
 		*(efi_runtime_text)
 		*(efi_runtime_data)
 	}
 
-	.__efi_runtime_stop : {
-		*(.__efi_runtime_stop)
+	efi_runtime_stop : {
+		*(___efi_runtime_stop)
 	}
 
-	.efi_runtime_rel_start :
-	{
-		*(.__efi_runtime_rel_start)
+	efi_runtime_rel_start : {
+		*(___efi_runtime_rel_start)
 	}
 
-	.efi_runtime_rel : {
+	efi_runtime_rel : {
 		*(.relefi_runtime_text)
 		*(.relefi_runtime_data)
 	}
 
-	.efi_runtime_rel_stop :
-	{
-		*(.__efi_runtime_rel_stop)
+	efi_runtime_rel_stop : {
+		*(___efi_runtime_rel_stop)
 	}
 
 	.dynsym :
arch/sandbox/lib/sections.c +4 -4
index 2559eeea38..2f2f3fbfdb 100644
@@ -5,9 +5,9 @@
  */
 #include <linux/compiler.h>
 
-char __efi_runtime_start[0] __section(".__efi_runtime_start");
-char __efi_runtime_stop[0] __section(".__efi_runtime_stop");
+char __efi_runtime_start[0] __section("___efi_runtime_start");
+char __efi_runtime_stop[0] __section("___efi_runtime_stop");
 char __efi_runtime_rel_start[0]
-		__section(".__efi_runtime_rel_start");
+		__section("___efi_runtime_rel_start");
 char __efi_runtime_rel_stop[0]
-		__section(".__efi_runtime_rel_stop");
+		__section("___efi_runtime_rel_stop");
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#7 lore raw

PATCH v3 5/13 sandbox: Add support for Address Sanitizer

In reply to Andrew Scull

Add CONFIG_ASAN to build with the Address Sanitizer. This only works with the sandbox so the config is likewise dependent. The resulting executable will have ASAN instrumentation, including the leak detector that can be disabled with the ASAN_OPTIONS environment variable:

ASAN_OPTIONS=detect_leaks=0 ./u-boot

Since u-boot uses its own dlmalloc, dynamic allocations aren't automatically instrumented, but stack variables and globals are.

Instrumentation could be added to dlmalloc to poison and unpoison memory as it is allocated and deallocated, and to introduce redzones between allocations. Alternatively, the sandbox may be able to play games with the system allocator and somehow still keep the required memory abstraction. No effort to address dynamic allocation is made by this patch.

The config is not yet enabled for any targets by default.

---
 Kconfig                |  7 +++++++
 arch/sandbox/config.mk | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
Kconfig +7 -0
index 797038b037..2257aca97f 100644
@@ -154,6 +154,13 @@ config CC_COVERAGE
 	  Enabling this option will pass "--coverage" to gcc to compile
 	  and link code instrumented for coverage analysis.
 
+config ASAN
+	bool "Enable AddressSanitizer"
+	depends on SANDBOX
+	help
+	  Enables AddressSanitizer to discover out-of-bounds accesses,
+	  use-after-free, double-free and memory leaks.
+
 config CC_HAS_ASM_INLINE
 	def_bool $(success,echo 'void foo(void) { asm inline (""); }' | $(CC) -x c - -c -o /dev/null)
 
arch/sandbox/config.mk +12 -2
index f3d3af6611..410603252e 100644
@@ -15,8 +15,16 @@ PLATFORM_LIBS += $(shell $(SDL_CONFIG) --libs)
 PLATFORM_CPPFLAGS += $(shell $(SDL_CONFIG) --cflags)
 endif
 
+SANITIZERS :=
+ifdef CONFIG_ASAN
+SANITIZERS	+= -fsanitize=address
+endif
+KBUILD_CFLAGS	+= $(SANITIZERS)
+
 cmd_u-boot__ = $(CC) -o $@ -Wl,-T u-boot.lds $(u-boot-init) \
-	$(KBUILD_LDFLAGS:%=-Wl,%)$(LTO_FINAL_LDFLAGS) \
+	$(KBUILD_LDFLAGS:%=-Wl,%) \
+	$(SANITIZERS) \
+	$(LTO_FINAL_LDFLAGS) \
 	-Wl,--whole-archive \
 		$(u-boot-main) \
 		$(u-boot-keep-syms-lto) \
@@ -24,7 +32,9 @@ cmd_u-boot__ = $(CC) -o $@ -Wl,-T u-boot.lds $(u-boot-init) \
 	$(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map
 
 cmd_u-boot-spl = (cd $(obj) && $(CC) -o $(SPL_BIN) -Wl,-T u-boot-spl.lds \
-	$(KBUILD_LDFLAGS:%=-Wl,%) $(LTO_FINAL_LDFLAGS) \
+	$(KBUILD_LDFLAGS:%=-Wl,%) \
+	$(SANITIZERS) \
+	$(LTO_FINAL_LDFLAGS) \
 	$(patsubst $(obj)/%,%,$(u-boot-spl-init)) \
 	-Wl,--whole-archive \
 		$(patsubst $(obj)/%,%,$(u-boot-spl-main)) \
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#8 lore raw

PATCH v3 6/13 test/py: test_stackprotector: Disable for ASAN

In reply to Andrew Scull

The stack protector test intentionally overflows a buffer in order to corrupt the stack canary so that it can test that the corruption is detected as expected. However, this is incompatible with ASAN, which detects the buffer overflow and interrupts the test, so disable the test for such configurations.

---
 test/py/tests/test_stackprotector.py | 1 +
 1 file changed, 1 insertion(+)
test/py/tests/test_stackprotector.py +1 -0
index b009437e5e..b87392c54f 100644
@@ -5,6 +5,7 @@ import pytest
 import signal
 
 @pytest.mark.buildconfigspec('cmd_stackprotector_test')
[email protected]('asan')
 def test_stackprotector(u_boot_console):
     """Test that the stackprotector function works."""
 
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#6 lore raw

PATCH v3 4/13 linker_lists: Rename sections to remove . prefix

In reply to Andrew Scull

Rename the sections used to implement linker lists so they begin with '__u_boot_list' rather than '.u_boot_list'. The double underscore at the start is still distinct from the single underscore used by the symbol names.

Having a '.' in the section names conflicts with clang's ASAN instrumentation which tries to add redzones between the linker list elements, causing expected accesses to fail. However, clang doesn't try to add redzones to user sections, which are names with all alphanumeric and underscore characters.

---
 arch/arc/cpu/u-boot.lds                       |  4 ++--
 arch/arm/config.mk                            |  4 ++--
 arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds   |  4 ++--
 arch/arm/cpu/armv7/sunxi/u-boot-spl.lds       |  4 ++--
 arch/arm/cpu/armv8/u-boot-spl.lds             |  4 ++--
 arch/arm/cpu/armv8/u-boot.lds                 |  4 ++--
 arch/arm/cpu/u-boot-spl.lds                   |  4 ++--
 arch/arm/cpu/u-boot.lds                       |  6 ++---
 arch/arm/mach-at91/arm926ejs/u-boot-spl.lds   |  2 +-
 arch/arm/mach-at91/armv7/u-boot-spl.lds       |  2 +-
 arch/arm/mach-omap2/u-boot-spl.lds            |  4 ++--
 arch/arm/mach-orion5x/u-boot-spl.lds          |  4 ++--
 arch/arm/mach-rockchip/u-boot-tpl-v8.lds      |  4 ++--
 arch/arm/mach-zynq/u-boot-spl.lds             |  4 ++--
 arch/arm/mach-zynq/u-boot.lds                 |  4 ++--
 arch/m68k/cpu/u-boot.lds                      |  4 ++--
 arch/microblaze/cpu/u-boot-spl.lds            |  4 ++--
 arch/microblaze/cpu/u-boot.lds                |  4 ++--
 arch/mips/config.mk                           |  2 +-
 arch/mips/cpu/u-boot-spl.lds                  |  4 ++--
 arch/mips/cpu/u-boot.lds                      |  4 ++--
 arch/nios2/cpu/u-boot.lds                     |  4 ++--
 arch/powerpc/cpu/mpc83xx/u-boot.lds           |  4 ++--
 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds       |  4 ++--
 arch/powerpc/cpu/mpc85xx/u-boot.lds           |  4 ++--
 arch/riscv/cpu/u-boot-spl.lds                 |  4 ++--
 arch/riscv/cpu/u-boot.lds                     |  4 ++--
 arch/sandbox/config.mk                        |  4 ++--
 arch/sandbox/cpu/u-boot-spl.lds               |  4 ++--
 arch/sandbox/cpu/u-boot.lds                   |  4 ++--
 arch/sh/cpu/u-boot.lds                        |  4 ++--
 arch/x86/cpu/u-boot-64.lds                    |  6 ++---
 arch/x86/cpu/u-boot-spl.lds                   |  6 ++---
 arch/x86/cpu/u-boot.lds                       |  6 ++---
 arch/x86/lib/elf_ia32_efi.lds                 |  4 ++--
 arch/x86/lib/elf_x86_64_efi.lds               |  4 ++--
 arch/xtensa/cpu/u-boot.lds                    |  4 ++--
 arch/xtensa/include/asm/ldscript.h            | 13 +++++++----
 board/compulab/cm_t335/u-boot.lds             |  4 ++--
 board/cssi/MCR3000/u-boot.lds                 |  4 ++--
 .../davinci/da8xxevm/u-boot-spl-da850evm.lds  |  2 +-
 board/qualcomm/dragonboard820c/u-boot.lds     |  4 ++--
 board/samsung/common/exynos-uboot-spl.lds     |  4 ++--
 board/synopsys/iot_devkit/u-boot.lds          |  4 ++--
 board/ti/am335x/u-boot.lds                    |  4 ++--
 board/vscom/baltos/u-boot.lds                 |  4 ++--
 doc/api/linker_lists.rst                      | 22 +++++++++----------
 doc/develop/commands.rst                      |  4 ++--
 doc/develop/driver-model/of-plat.rst          |  4 ++--
 include/linker_lists.h                        | 18 +++++++--------
 tools/mips-relocs.c                           |  9 ++++----
 51 files changed, 128 insertions(+), 122 deletions(-)
arch/arc/cpu/u-boot.lds +2 -2
index e12145c768..9f2973da65 100644
@@ -39,8 +39,8 @@ SECTIONS
 	}
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
arch/arm/config.mk +2 -2
index b107b1af27..b3548ce243 100644
@@ -141,11 +141,11 @@ endif
 # limit ourselves to the sections we want in the .bin.
 ifdef CONFIG_ARM64
 OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .data \
-		-j .u_boot_list -j .rela.dyn -j .got -j .got.plt \
+		-j __u_boot_list -j .rela.dyn -j .got -j .got.plt \
 		-j .binman_sym_table -j .text_rest
 else
 OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .hash \
-		-j .data -j .got -j .got.plt -j .u_boot_list -j .rel.dyn \
+		-j .data -j .got -j .got.plt -j __u_boot_list -j .rel.dyn \
 		-j .binman_sym_table -j .text_rest
 endif
 
arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds +2 -2
index 9a000ac5d3..c108736811 100644
@@ -29,8 +29,8 @@ SECTIONS
 	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	} > .sram
 
 	. = ALIGN(4);
arch/arm/cpu/armv7/sunxi/u-boot-spl.lds +2 -2
index 942c29fc95..306a4ddf3c 100644
@@ -38,8 +38,8 @@ SECTIONS
 	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	} > .sram
 
 	. = ALIGN(4);
arch/arm/cpu/armv8/u-boot-spl.lds +2 -2
index 730eb93dbc..d02b788e60 100644
@@ -46,9 +46,9 @@ SECTIONS
 	} >.sram
 #endif
 
-	.u_boot_list : {
+	__u_boot_list : {
 		. = ALIGN(8);
-		KEEP(*(SORT(.u_boot_list*)));
+		KEEP(*(SORT(__u_boot_list*)));
 	} >.sram
 
 	.image_copy_end : {
arch/arm/cpu/armv8/u-boot.lds +2 -2
index 2554980595..8fe4682dd2 100644
@@ -109,8 +109,8 @@ SECTIONS
 	. = .;
 
 	. = ALIGN(8);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(8);
arch/arm/cpu/u-boot-spl.lds +2 -2
index 97899a567f..fb2189d50d 100644
@@ -32,8 +32,8 @@ SECTIONS
 	}
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
arch/arm/cpu/u-boot.lds +3 -3
index 0eb164d2e6..f25f72b2e0 100644
@@ -15,7 +15,7 @@ ENTRY(_start)
 SECTIONS
 {
 #ifndef CONFIG_CMDLINE
-	/DISCARD/ : { *(.u_boot_list_2_cmd_*) }
+	/DISCARD/ : { *(__u_boot_list_2_cmd_*) }
 #endif
 #if defined(CONFIG_ARMV7_SECURE_BASE) && defined(CONFIG_ARMV7_NONSEC)
 	/*
@@ -149,8 +149,8 @@ SECTIONS
 	. = .;
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
arch/arm/mach-at91/arm926ejs/u-boot-spl.lds +1 -1
index 74f6355229..1a8bf94dee 100644
@@ -29,7 +29,7 @@ SECTIONS
 	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
 
 	. = ALIGN(4);
-	.u_boot_list : { KEEP(*(SORT(.u_boot_list*))) } > .sram
+	__u_boot_list : { KEEP(*(SORT(__u_boot_list*))) } > .sram
 
 	. = ALIGN(4);
 	__image_copy_end = .;
arch/arm/mach-at91/armv7/u-boot-spl.lds +1 -1
index 950ea55d7c..6ca725fc4c 100644
@@ -36,7 +36,7 @@ SECTIONS
 	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
 
 	. = ALIGN(4);
-	.u_boot_list : { KEEP(*(SORT(.u_boot_list*))) } > .sram
+	__u_boot_list : { KEEP(*(SORT(__u_boot_list*))) } > .sram
 
 	. = ALIGN(4);
 	__image_copy_end = .;
arch/arm/mach-omap2/u-boot-spl.lds +2 -2
index 88d81f9b98..1d6e5d45b4 100644
@@ -33,8 +33,8 @@ SECTIONS
 	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	} >.sram
 
 	. = ALIGN(4);
arch/arm/mach-orion5x/u-boot-spl.lds +2 -2
index a537fe0295..154bb12060 100644
@@ -41,8 +41,8 @@ SECTIONS
 	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.nor
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	} > .nor
 
 	. = ALIGN(4);
arch/arm/mach-rockchip/u-boot-tpl-v8.lds +2 -2
index 9869972e22..74618eba59 100644
@@ -39,9 +39,9 @@ SECTIONS
 		*(.data*)
 	}
 
-	.u_boot_list : {
+	__u_boot_list : {
 		. = ALIGN(8);
-		KEEP(*(SORT(.u_boot_list*)));
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	.image_copy_end : {
arch/arm/mach-zynq/u-boot-spl.lds +2 -2
index 106d2e390b..8c18d3f91f 100644
@@ -37,8 +37,8 @@ SECTIONS
 	} > .sram
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	} > .sram
 
 	. = ALIGN(4);
arch/arm/mach-zynq/u-boot.lds +2 -2
index 91c32e89e8..a5169fd915 100644
@@ -54,8 +54,8 @@ SECTIONS
 	. = .;
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
arch/m68k/cpu/u-boot.lds +2 -2
index affb2d9374..133f79150b 100644
@@ -60,8 +60,8 @@ SECTIONS
 	. = .;
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = .;
arch/microblaze/cpu/u-boot-spl.lds +2 -2
index 7883a64b15..4ac5a21524 100644
@@ -37,8 +37,8 @@ SECTIONS
 	}
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 	__init_end = . ;
 
arch/microblaze/cpu/u-boot.lds +2 -2
index 2b316cc7f5..8bd515b099 100644
@@ -41,8 +41,8 @@ SECTIONS
 	}
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 	__init_end = . ;
 
arch/mips/config.mk +1 -1
index faf4129ac1..04f3627805 100644
@@ -65,6 +65,6 @@ PLATFORM_CPPFLAGS		+= -msoft-float
 KBUILD_LDFLAGS			+= -G 0 -static -n -nostdlib
 PLATFORM_RELFLAGS		+= -ffunction-sections -fdata-sections
 LDFLAGS_FINAL			+= --gc-sections
-OBJCOPYFLAGS			+= -j .text -j .rodata -j .data -j .u_boot_list
+OBJCOPYFLAGS			+= -j .text -j .rodata -j .data -j __u_boot_list
 
 LDFLAGS_STANDALONE		+= --gc-sections
arch/mips/cpu/u-boot-spl.lds +2 -2
index 28ea4f2a48..194398be85 100644
@@ -29,8 +29,8 @@ SECTIONS
 
 #if defined(CONFIG_SPL_DM) || defined(CONFIG_SPL_LOADER_SUPPORT)
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	} > .spl_mem
 #endif
 
arch/mips/cpu/u-boot.lds +2 -2
index 86496737d3..9a4ebcd151 100644
@@ -33,8 +33,8 @@ SECTIONS
 	}
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
arch/nios2/cpu/u-boot.lds +2 -2
index cbf54b4610..5b9e27d940 100644
@@ -32,8 +32,8 @@ SECTIONS
 	 */
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	/* INIT DATA sections - "Small" data (see the gcc -G option)
arch/powerpc/cpu/mpc83xx/u-boot.lds +2 -2
index d10f528da4..1a1e537b2a 100644
@@ -42,8 +42,8 @@ SECTIONS
   . = .;
 
   . = ALIGN(4);
-  .u_boot_list : {
-	KEEP(*(SORT(.u_boot_list*)));
+  __u_boot_list : {
+	KEEP(*(SORT(__u_boot_list*)));
   }
 
 
arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +2 -2
index 1b4d1e05a4..06a70ff2af 100644
@@ -50,8 +50,8 @@ SECTIONS
 	_edata  =  .;
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = .;
arch/powerpc/cpu/mpc85xx/u-boot.lds +2 -2
index e1bbee43bc..8bbe319b3e 100644
@@ -67,8 +67,8 @@ SECTIONS
   . = .;
 
   . = ALIGN(4);
-  .u_boot_list : {
-	KEEP(*(SORT(.u_boot_list*)));
+  __u_boot_list : {
+	KEEP(*(SORT(__u_boot_list*)));
   }
 
   . = .;
arch/riscv/cpu/u-boot-spl.lds +2 -2
index d0495ce248..993536302a 100644
@@ -40,8 +40,8 @@ SECTIONS
 
 	. = ALIGN(4);
 
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	} > .spl_mem
 
 	. = ALIGN(4);
arch/riscv/cpu/u-boot.lds +2 -2
index c00d17c736..1c937aebee 100644
@@ -44,8 +44,8 @@ SECTIONS
 
 	. = ALIGN(4);
 
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
arch/sandbox/config.mk +2 -2
index 02a3ba0c0e..f3d3af6611 100644
@@ -44,13 +44,13 @@ EFI_TARGET := --target=efi-app-ia32
 else ifeq ($(HOST_ARCH),$(HOST_ARCH_AARCH64))
 EFI_LDS := ${SRCDIR}/../../../arch/arm/lib/elf_aarch64_efi.lds
 OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .data \
-		-j .u_boot_list -j .rela.dyn -j .got -j .got.plt \
+		-j __u_boot_list -j .rela.dyn -j .got -j .got.plt \
 		-j .binman_sym_table -j .text_rest \
 		-j .efi_runtime -j .efi_runtime_rel
 else ifeq ($(HOST_ARCH),$(HOST_ARCH_ARM))
 EFI_LDS := ${SRCDIR}/../../../arch/arm/lib/elf_arm_efi.lds
 OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .hash \
-		-j .data -j .got -j .got.plt -j .u_boot_list -j .rel.dyn \
+		-j .data -j .got -j .got.plt -j __u_boot_list -j .rel.dyn \
 		-j .binman_sym_table -j .text_rest \
 		-j .efi_runtime -j .efi_runtime_rel
 else ifeq ($(HOST_ARCH),$(HOST_ARCH_RISCV32))
arch/sandbox/cpu/u-boot-spl.lds +2 -2
index 6b300bcc93..ef885fd0cb 100644
@@ -9,8 +9,8 @@ SECTIONS
 {
 
 	. = ALIGN(32);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	/* Private data for devices with OF_PLATDATA_RT */
arch/sandbox/cpu/u-boot.lds +2 -2
index 1f89a3329e..ba8dee50c7 100644
@@ -9,8 +9,8 @@ SECTIONS
 {
 
 	. = ALIGN(32);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	_u_boot_sandbox_getopt : {
arch/sh/cpu/u-boot.lds +2 -2
index 4cc97737f1..ff80ce78f3 100644
@@ -70,8 +70,8 @@ SECTIONS
 	} >ram
 	PROVIDE (_egot = .);
 
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	} >ram
 
 	PROVIDE (__init_end = .);
arch/x86/cpu/u-boot-64.lds +3 -3
index 92a30c2a38..53c56043a9 100644
@@ -12,7 +12,7 @@ ENTRY(_start)
 SECTIONS
 {
 #ifndef CONFIG_CMDLINE
-	/DISCARD/ : { *(.u_boot_list_2_cmd_*) }
+	/DISCARD/ : { *(__u_boot_list_2_cmd_*) }
 #endif
 
 #ifdef CONFIG_SYS_TEXT_BASE
@@ -41,8 +41,8 @@ SECTIONS
 	. = ALIGN(4);
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
arch/x86/cpu/u-boot-spl.lds +3 -3
index 346f60bdac..a0a2a06a18 100644
@@ -12,7 +12,7 @@ ENTRY(_start)
 SECTIONS
 {
 #ifndef CONFIG_CMDLINE
-	/DISCARD/ : { *(.u_boot_list_2_cmd_*) }
+	/DISCARD/ : { *(__u_boot_list_2_cmd_*) }
 #endif
 
 	. = IMAGE_TEXT_BASE;	/* Location of bootcode in flash */
@@ -25,8 +25,8 @@ SECTIONS
 	. = ALIGN(4);
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
arch/x86/cpu/u-boot.lds +3 -3
index 22fde01e74..7c87209834 100644
@@ -12,7 +12,7 @@ ENTRY(_start)
 SECTIONS
 {
 #ifndef CONFIG_CMDLINE
-	/DISCARD/ : { *(.u_boot_list_2_cmd_*) }
+	/DISCARD/ : { *(__u_boot_list_2_cmd_*) }
 #endif
 
 	. = CONFIG_SYS_TEXT_BASE;	/* Location of bootcode in flash */
@@ -39,8 +39,8 @@ SECTIONS
 	. = ALIGN(4);
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
arch/x86/lib/elf_ia32_efi.lds +2 -2
index aad61e7f81..6d89c1fbd5 100644
@@ -51,7 +51,7 @@ SECTIONS
 
 		/* U-Boot lists and device tree */
 		. = ALIGN(8);
-		*(SORT(.u_boot_list*));
+		*(SORT(__u_boot_list*));
 		. = ALIGN(8);
 		*(.dtb*);
 	}
@@ -69,7 +69,7 @@ SECTIONS
 		*(.data.rel.local)
 		*(.data.rel.ro)
 		*(.data.rel*)
-		*(.rel.u_boot_list*)
+		*(.rel__u_boot_list*)
 	}
 	. = ALIGN(4096);
 		.reloc :	/* This is the PECOFF .reloc section! */
arch/x86/lib/elf_x86_64_efi.lds +2 -2
index 75727400aa..ada024c05c 100644
@@ -50,7 +50,7 @@ SECTIONS
 
 		/* U-Boot lists and device tree */
 		. = ALIGN(8);
-		*(SORT(.u_boot_list*));
+		*(SORT(__u_boot_list*));
 		. = ALIGN(8);
 		*(.dtb*);
 	}
@@ -63,7 +63,7 @@ SECTIONS
 		*(.rela.data*)
 		*(.rela.got)
 		*(.rela.stab)
-                *(.rela.u_boot_list*)
+                *(.rela__u_boot_list*)
 	}
 
 	. = ALIGN(4096);
arch/xtensa/cpu/u-boot.lds +2 -2
index 493f3fdb99..84ba32c044 100644
@@ -49,7 +49,7 @@ SECTIONS
     RELOCATE1(text);
     RELOCATE1(rodata);
     RELOCATE1(data);
-    RELOCATE1(u_boot_list);
+    RELOCATE_USER1(__u_boot_list);
     __reloc_table_end = ABSOLUTE(.);
   }
 
@@ -78,7 +78,7 @@ SECTIONS
   SECTION_text(XTENSA_SYS_TEXT_ADDR, FOLLOWING(.DoubleExceptionVector.text))
   SECTION_rodata(ALIGN(16), FOLLOWING(.text))
   SECTION_u_boot_list(ALIGN(16), FOLLOWING(.rodata))
-  SECTION_data(ALIGN(16), FOLLOWING(.u_boot_list))
+  SECTION_data(ALIGN(16), FOLLOWING(__u_boot_list))
 
   __reloc_end = .;
   __init_end = .;
arch/xtensa/include/asm/ldscript.h +9 -4
index 08f5d0135e..78a0b230bd 100644
@@ -41,6 +41,11 @@
 	LONG(_##_sym_##_##_sec_##_end);					\
 	LONG(LOADADDR(.##_sym_##.##_sec_));
 
+#define RELOCATE_USER1(_sec_)						\
+	LONG(_##_sec_##_start);						\
+	LONG(_##_sec_##_end);						\
+	LONG(LOADADDR(_sec_));
+
 #define SECTION_VECTOR(_sym_, _sec_, _vma_, _lma_)			\
 .##_sym_##.##_sec_ _vma_ : _lma_					\
 {									\
@@ -100,11 +105,11 @@
 	}
 
 #define SECTION_u_boot_list(_vma_, _lma_)				\
-	.u_boot_list _vma_ : _lma_					\
+	__u_boot_list _vma_ : _lma_					\
 	{								\
-		_u_boot_list_start = ABSOLUTE(.);			\
-		KEEP(*(SORT(.u_boot_list*)));				\
-		_u_boot_list_end = ABSOLUTE(.);				\
+		___u_boot_list_start = ABSOLUTE(.);			\
+		KEEP(*(SORT(__u_boot_list*)));				\
+		___u_boot_list_end = ABSOLUTE(.);			\
 	}
 
 #define SECTION_data(_vma_, _lma_)					\
board/compulab/cm_t335/u-boot.lds +2 -2
index b00e466d58..4993880461 100644
@@ -36,8 +36,8 @@ SECTIONS
 	. = .;
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
board/cssi/MCR3000/u-boot.lds +2 -2
index 70aef3241c..24b535e724 100644
@@ -59,8 +59,8 @@ SECTIONS
 	. = .;
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = .;
board/davinci/da8xxevm/u-boot-spl-da850evm.lds +1 -1
index 8f04911306..de1c9c6fce 100644
@@ -36,7 +36,7 @@ SECTIONS
 	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
 
 	. = ALIGN(4);
-	.u_boot_list : { KEEP(*(SORT(.u_boot_list*))); } >.sram
+	__u_boot_list : { KEEP(*(SORT(__u_boot_list*))); } >.sram
 
 	. = ALIGN(4);
 	.rel.dyn : {
board/qualcomm/dragonboard820c/u-boot.lds +2 -2
index dcf8256cec..5251b59fbe 100644
@@ -49,8 +49,8 @@ SECTIONS
 	. = .;
 
 	. = ALIGN(8);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(8);
board/samsung/common/exynos-uboot-spl.lds +2 -2
index 5b32f7feb8..73cd97a1b1 100644
@@ -32,8 +32,8 @@ SECTIONS
 	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
 	. = ALIGN(4);
 
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	} >.sram
 	. = ALIGN(4);
 
board/synopsys/iot_devkit/u-boot.lds +2 -2
index d083168705..dca2e2daee 100644
@@ -39,8 +39,8 @@ SECTIONS
 	} > ROM
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 
 		/* Mark RAM's LMA */
 		. = ALIGN(4);
board/ti/am335x/u-boot.lds +2 -2
index 03c1d5f73b..087dee8bb2 100644
@@ -72,8 +72,8 @@ SECTIONS
 	. = .;
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
board/vscom/baltos/u-boot.lds +2 -2
index 315ba5b99a..cb2ee67697 100644
@@ -53,8 +53,8 @@ SECTIONS
 	. = .;
 
 	. = ALIGN(4);
-	.u_boot_list : {
-		KEEP(*(SORT(.u_boot_list*)));
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
 	}
 
 	. = ALIGN(4);
doc/api/linker_lists.rst +11 -11
index 7063fdc831..3cd447f187 100644
@@ -13,7 +13,7 @@ then the corresponding input section name is
 
 ::
 
-  .u_boot_list_ + 2_ + @_list + _2_ + @_entry
+  __u_boot_list_ + 2_ + @_list + _2_ + @_entry
 
 and the C variable name is
 
@@ -23,7 +23,7 @@ and the C variable name is
 
 This ensures uniqueness for both input section and C variable name.
 
-Note that the names differ only in the first character, "." for the
+Note that the names differ only in the characters, "__" for the
 section and "_" for the variable, so that the linker cannot confuse
 section and symbol names. From now on, both names will be referred
 to as
@@ -63,11 +63,11 @@ iterated at least once.
 
 ::
 
-  .u_boot_list_2_array_1
-  .u_boot_list_2_array_2_first
-  .u_boot_list_2_array_2_second
-  .u_boot_list_2_array_2_third
-  .u_boot_list_2_array_3
+  __u_boot_list_2_array_1
+  __u_boot_list_2_array_2_first
+  __u_boot_list_2_array_2_second
+  __u_boot_list_2_array_2_third
+  __u_boot_list_2_array_3
 
 If lists must be divided into sublists (e.g. for iterating only on
 part of a list), one can simply give the list a name of the form
@@ -129,17 +129,17 @@ the compiler cannot update the alignment of the linker_list item.
 
 In the first case, an 8-byte 'fill' region is added::
 
-   .u_boot_list_2_driver_2_testbus_drv
+   __u_boot_list_2_driver_2_testbus_drv
                0x0000000000270018       0x80 test/built-in.o
                0x0000000000270018                _u_boot_list_2_driver_2_testbus_drv
-   .u_boot_list_2_driver_2_testfdt1_drv
+   __u_boot_list_2_driver_2_testfdt1_drv
                0x0000000000270098       0x80 test/built-in.o
                0x0000000000270098                _u_boot_list_2_driver_2_testfdt1_drv
    *fill*         0x0000000000270118        0x8
-   .u_boot_list_2_driver_2_testfdt_drv
+   __u_boot_list_2_driver_2_testfdt_drv
                0x0000000000270120       0x80 test/built-in.o
                0x0000000000270120                _u_boot_list_2_driver_2_testfdt_drv
-   .u_boot_list_2_driver_2_testprobe_drv
+   __u_boot_list_2_driver_2_testprobe_drv
                0x00000000002701a0       0x80 test/built-in.o
                0x00000000002701a0                _u_boot_list_2_driver_2_testprobe_drv
 
doc/develop/commands.rst +2 -2
index c72d1b0aaa..ede880d248 100644
@@ -169,8 +169,8 @@ by writing in u-boot.lds ($(srctree)/board/boardname/u-boot.lds) these
 
 .. code-block:: c
 
-    .u_boot_list : {
-        KEEP(*(SORT(.u_boot_list*)));
+    __u_boot_list : {
+        KEEP(*(SORT(__u_boot_list*)));
     }
 
 Writing tests
doc/develop/driver-model/of-plat.rst +2 -2
index 237af38ad4..b454f7be85 100644
@@ -707,9 +707,9 @@ Link errors / undefined reference
 Sometimes dtoc does not find the problem for you, but something is wrong and
 you get a link error, e.g.::
 
-   :(.u_boot_list_2_udevice_2_spl_test5+0x0): undefined reference to
+   :(__u_boot_list_2_udevice_2_spl_test5+0x0): undefined reference to
       `_u_boot_list_2_driver_2_sandbox_spl_test'
-   /usr/bin/ld: dts/dt-uclass.o:(.u_boot_list_2_uclass_2_misc+0x8):
+   /usr/bin/ld: dts/dt-uclass.o:(__u_boot_list_2_uclass_2_misc+0x8):
         undefined reference to `_u_boot_list_2_uclass_driver_2_misc'
 
 The first one indicates that the device cannot find its driver. This means that
include/linker_lists.h +9 -9
index 0575164ce4..d3da9d44e8 100644
@@ -70,7 +70,7 @@
 #define ll_entry_declare(_type, _name, _list)				\
 	_type _u_boot_list_2_##_list##_2_##_name __aligned(4)		\
 			__attribute__((unused))				\
-			__section(".u_boot_list_2_"#_list"_2_"#_name)
+			__section("__u_boot_list_2_"#_list"_2_"#_name)
 
 /**
  * ll_entry_declare_list() - Declare a list of link-generated array entries
@@ -93,7 +93,7 @@
 #define ll_entry_declare_list(_type, _name, _list)			\
 	_type _u_boot_list_2_##_list##_2_##_name[] __aligned(4)		\
 			__attribute__((unused))				\
-			__section(".u_boot_list_2_"#_list"_2_"#_name)
+			__section("__u_boot_list_2_"#_list"_2_"#_name)
 
 /*
  * We need a 0-byte-size type for iterator symbols, and the compiler
@@ -110,7 +110,7 @@
  * @_list:	Name of the list in which this entry is placed
  *
  * This function returns ``(_type *)`` pointer to the very first entry of a
- * linker-generated array placed into subsection of .u_boot_list section
+ * linker-generated array placed into subsection of __u_boot_list section
  * specified by _list argument.
  *
  * Since this macro defines an array start symbol, its leftmost index
@@ -126,7 +126,7 @@
 ({									\
 	static char start[0] __aligned(CONFIG_LINKER_LIST_ALIGN)	\
 		__attribute__((unused))					\
-		__section(".u_boot_list_2_"#_list"_1");			\
+		__section("__u_boot_list_2_"#_list"_1");			\
 	(_type *)&start;						\
 })
 
@@ -137,7 +137,7 @@
  *		(with underscores instead of dots)
  *
  * This function returns ``(_type *)`` pointer after the very last entry of
- * a linker-generated array placed into subsection of .u_boot_list
+ * a linker-generated array placed into subsection of __u_boot_list
  * section specified by _list argument.
  *
  * Since this macro defines an array end symbol, its leftmost index
@@ -152,7 +152,7 @@
 #define ll_entry_end(_type, _list)					\
 ({									\
 	static char end[0] __aligned(4) __attribute__((unused))		\
-		__section(".u_boot_list_2_"#_list"_3");			\
+		__section("__u_boot_list_2_"#_list"_3");			\
 	(_type *)&end;							\
 })
 /**
@@ -161,7 +161,7 @@
  * @_list:	Name of the list of which the number of elements is computed
  *
  * This function returns the number of elements of a linker-generated array
- * placed into subsection of .u_boot_list section specified by _list
+ * placed into subsection of __u_boot_list section specified by _list
  * argument. The result is of an unsigned int type.
  *
  * Example:
@@ -246,7 +246,7 @@
 #define ll_start(_type)							\
 ({									\
 	static char start[0] __aligned(4) __attribute__((unused))	\
-		__section(".u_boot_list_1");				\
+		__section("__u_boot_list_1");				\
 	(_type *)&start;						\
 })
 
@@ -269,7 +269,7 @@
 #define ll_end(_type)							\
 ({									\
 	static char end[0] __aligned(4) __attribute__((unused))		\
-		__section(".u_boot_list_3");				\
+		__section("__u_boot_list_3");				\
 	(_type *)&end;							\
 })
 
tools/mips-relocs.c +5 -4
index 625258085b..5db610f5c7 100644
@@ -312,7 +312,7 @@ int main(int argc, char *argv[])
 		goto out_free_relocs;
 	}
 
-	rel_pfx = is_64 ? ".rela." : ".rel.";
+	rel_pfx = is_64 ? ".rela" : ".rel";
 
 	for (i = 0; i < ehdr_field(e_shnum); i++) {
 		sh_type = shdr_field(i, sh_type);
@@ -321,10 +321,11 @@ int main(int argc, char *argv[])
 
 		sh_name = shstr(shdr_field(i, sh_name));
 		if (strncmp(sh_name, rel_pfx, strlen(rel_pfx))) {
-			if (strcmp(sh_name, ".rel") && strcmp(sh_name, ".rel.dyn"))
-				fprintf(stderr, "WARNING: Unexpected reloc section name '%s'\n", sh_name);
+			fprintf(stderr, "WARNING: Unexpected reloc section name '%s'\n", sh_name);
 			continue;
 		}
+		if (!strcmp(sh_name, ".rel") || !strcmp(sh_name, ".rel.dyn"))
+			continue;
 
 		/*
 		 * Skip reloc sections which either don't correspond to another
@@ -334,7 +335,7 @@ int main(int argc, char *argv[])
 		 */
 		skip = true;
 		for (j = 0; j < ehdr_field(e_shnum); j++) {
-			if (strcmp(&sh_name[strlen(rel_pfx) - 1], shstr(shdr_field(j, sh_name))))
+			if (strcmp(&sh_name[strlen(rel_pfx)], shstr(shdr_field(j, sh_name))))
 				continue;
 
 			skip = !(shdr_field(j, sh_flags) & SHF_ALLOC);
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#9 lore raw

PATCH v3 7/13 CI: Azure: Build with ASAN enabled

In reply to Andrew Scull

In order to prevent build regressions with ASAN, add the builds to CI. The longer term objective will be to enabled test targets with ASAN enabled, but there are too many at the moment.

---
 .azure-pipelines.yml | 6 ++++++
 1 file changed, 6 insertions(+)
.azure-pipelines.yml +6 -0
index ad540ea635..915d5115b1 100644
@@ -473,6 +473,12 @@ stages:
           BUILDMAN: "imx8"
         keystone2_keystone3:
           BUILDMAN: "k2 k3"
+        sandbox_asan:
+          BUILDMAN: "sandbox"
+          OVERRIDE: "-a ASAN"
+        sandbox_clang_asan:
+          BUILDMAN: "sandbox"
+          OVERRIDE: "-O clang-13 -a ASAN"
         samsung_socfpga:
           BUILDMAN: "samsung socfpga"
         sun4i:
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#10 lore raw

PATCH v3 8/13 fuzzing_engine: Add fuzzing engine uclass

In reply to Andrew Scull

This new class of device will provide fuzzing inputs from a fuzzing engine.

---
 drivers/Kconfig                      |  2 ++
 drivers/Makefile                     |  1 +
 drivers/fuzz/Kconfig                 |  9 +++++
 drivers/fuzz/Makefile                |  7 ++++
 drivers/fuzz/fuzzing_engine-uclass.c | 28 +++++++++++++++
 include/dm/uclass-id.h               |  1 +
 include/fuzzing_engine.h             | 51 ++++++++++++++++++++++++++++
 7 files changed, 99 insertions(+)
 create mode 100644 drivers/fuzz/Kconfig
 create mode 100644 drivers/fuzz/Makefile
 create mode 100644 drivers/fuzz/fuzzing_engine-uclass.c
 create mode 100644 include/fuzzing_engine.h
drivers/Kconfig +2 -0
index b26ca8cf70..8b6fead351 100644
@@ -40,6 +40,8 @@ source "drivers/fastboot/Kconfig"
 
 source "drivers/firmware/Kconfig"
 
+source "drivers/fuzz/Kconfig"
+
 source "drivers/fpga/Kconfig"
 
 source "drivers/gpio/Kconfig"
drivers/Makefile +1 -0
index 67c8af7442..d63fd1c04d 100644
@@ -115,6 +115,7 @@ obj-$(CONFIG_W1) += w1/
 obj-$(CONFIG_W1_EEPROM) += w1-eeprom/
 
 obj-$(CONFIG_MACH_PIC32) += ddr/microchip/
+obj-$(CONFIG_FUZZ) += fuzz/
 obj-$(CONFIG_DM_HWSPINLOCK) += hwspinlock/
 obj-$(CONFIG_DM_RNG) += rng/
 endif
drivers/fuzz/Kconfig new file +9 -0
new file mode 100644
index 0000000000..a03120f63a
@@ -0,0 +1,9 @@
+config DM_FUZZING_ENGINE
+	bool "Driver support for fuzzing engine devices"
+	depends on DM
+	help
+	  Enable driver model for fuzzing engine devices. This interface is
+	  used to get successive inputs from a fuzzing engine that aims to
+	  explore different code paths in a fuzz test. The fuzzing engine may
+	  be instrumenting the execution in order to more effectively generate
+	  inputs that explore different code paths.
drivers/fuzz/Makefile new file +7 -0
new file mode 100644
index 0000000000..acd894999c
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (c) 2022 Google, Inc.
+# Written by Andrew Scull <[email protected]>
+#
+
+obj-$(CONFIG_DM_FUZZING_ENGINE) += fuzzing_engine-uclass.o
drivers/fuzz/fuzzing_engine-uclass.c new file +28 -0
new file mode 100644
index 0000000000..b16f1c4cfb
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (c) 2022 Google, Inc.
+ * Written by Andrew Scull <[email protected]>
+ */
+
+#define LOG_CATEGORY UCLASS_FUZZING_ENGINE
+
+#include <common.h>
+#include <dm.h>
+#include <fuzzing_engine.h>
+
+int dm_fuzzing_engine_get_input(struct udevice *dev,
+				const uint8_t **data,
+				size_t *size)
+{
+	const struct dm_fuzzing_engine_ops *ops = device_get_ops(dev);
+
+	if (!ops->get_input)
+		return -ENOSYS;
+
+	return ops->get_input(dev, data, size);
+}
+
+UCLASS_DRIVER(fuzzing_engine) = {
+	.name = "fuzzing_engine",
+	.id = UCLASS_FUZZING_ENGINE,
+};
include/dm/uclass-id.h +1 -0
index 3ba69ad9a0..a432e43871 100644
@@ -56,6 +56,7 @@ enum uclass_id {
 	UCLASS_ETH,		/* Ethernet device */
 	UCLASS_ETH_PHY,		/* Ethernet PHY device */
 	UCLASS_FIRMWARE,	/* Firmware */
+	UCLASS_FUZZING_ENGINE,	/* Fuzzing engine */
 	UCLASS_FS_FIRMWARE_LOADER,		/* Generic loader */
 	UCLASS_GPIO,		/* Bank of general-purpose I/O pins */
 	UCLASS_HASH,		/* Hash device */
include/fuzzing_engine.h new file +51 -0

51 lines not on this page · raw message

Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#11 lore raw

PATCH v3 9/13 test: fuzz: Add framework for fuzzing

In reply to Andrew Scull

Add the basic infrastructure for declaring fuzz tests and a command to invoke them.

---
 Kconfig              |  9 +++++
 include/test/fuzz.h  | 51 +++++++++++++++++++++++++++
 test/Makefile        |  1 +
 test/fuzz/Makefile   |  7 ++++
 test/fuzz/cmd_fuzz.c | 82 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 150 insertions(+)
 create mode 100644 include/test/fuzz.h
 create mode 100644 test/fuzz/Makefile
 create mode 100644 test/fuzz/cmd_fuzz.c
Kconfig +9 -0
index 2257aca97f..fbd16a3f03 100644
@@ -161,6 +161,15 @@ config ASAN
 	  Enables AddressSanitizer to discover out-of-bounds accesses,
 	  use-after-free, double-free and memory leaks.
 
+config FUZZ
+	bool "Enable fuzzing"
+	depends on CC_IS_CLANG
+	depends on DM_FUZZING_ENGINE
+	select ASAN
+	help
+	  Enables the fuzzing infrastructure to generate fuzzing data and run
+          fuzz tests.
+
 config CC_HAS_ASM_INLINE
 	def_bool $(success,echo 'void foo(void) { asm inline (""); }' | $(CC) -x c - -c -o /dev/null)
 
include/test/fuzz.h new file +51 -0

51 lines not on this page · raw message

test/Makefile +1 -0
index abd605a435..1dfd567744 100644
@@ -16,6 +16,7 @@ obj-$(CONFIG_$(SPL_)CMDLINE) += cmd_ut.o
 obj-$(CONFIG_$(SPL_)CMDLINE) += command_ut.o
 obj-$(CONFIG_$(SPL_)UT_COMPRESSION) += compression.o
 obj-y += dm/
+obj-$(CONFIG_FUZZ) += fuzz/
 obj-$(CONFIG_$(SPL_)CMDLINE) += print_ut.o
 obj-$(CONFIG_$(SPL_)CMDLINE) += str_ut.o
 obj-$(CONFIG_UT_TIME) += time_ut.o
test/fuzz/Makefile new file +7 -0
new file mode 100644
index 0000000000..03eeeeb497
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (c) 2022 Google, Inc.
+# Written by Andrew Scull <[email protected]>
+#
+
+obj-$(CONFIG_$(SPL_)CMDLINE) += cmd_fuzz.o
test/fuzz/cmd_fuzz.c new file +82 -0

82 lines not on this page · raw message

Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#12 lore raw

PATCH v3 10/13 sandbox: Decouple program entry from sandbox init

In reply to Andrew Scull

Move the program's entry point to os.c, in preparation for a separate fuzzing entry point to be added.

---
 arch/sandbox/cpu/os.c           |  6 ++++++
 arch/sandbox/cpu/start.c        |  2 +-
 arch/sandbox/include/asm/main.h | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 arch/sandbox/include/asm/main.h
arch/sandbox/cpu/os.c +6 -0
index 5ea5417917..f229d1621a 100644
@@ -27,6 +27,7 @@
 #include <linux/types.h>
 
 #include <asm/getopt.h>
+#include <asm/main.h>
 #include <asm/sections.h>
 #include <asm/state.h>
 #include <os.h>
@@ -1001,3 +1002,8 @@ void os_relaunch(char *argv[])
 	execv(argv[0], argv);
 	os_exit(1);
 }
+
+int main(int argc, char *argv[])
+{
+	return sandbox_main(argc, argv);
+}
arch/sandbox/cpu/start.c +1 -1
index 0f5a87309d..90a84e93c7 100644
@@ -453,7 +453,7 @@ void sandbox_reset(void)
 	os_relaunch(os_argv);
 }
 
-int main(int argc, char *argv[])
+int sandbox_main(int argc, char *argv[])
 {
 	struct sandbox_state *state;
 	void * text_base;
arch/sandbox/include/asm/main.h new file +18 -0
new file mode 100644
index 0000000000..7a2f0d3a8d
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (c) 2022 Google, Inc.
+ * Written by Andrew Scull <[email protected]>
+ */
+
+#ifndef __ASM_SANDBOX_MAIN_H
+#define __ASM_SANDBOX_MAIN_H
+
+/**
+ * sandbox_main() - main entrypoint for sandbox
+ *
+ * @argc:	the number of arguments passed to the program
+ * @argv:	array of argc+1 pointers, of which the last one is null
+ */
+int sandbox_main(int argc, char *argv[]);
+
+#endif /* __ASM_SANDBOX_MAIN_H */
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#13 lore raw

PATCH v3 11/13 sandbox: Add libfuzzer integration

In reply to Andrew Scull

Add an implementation of LLVMFuzzerTestOneInput() that starts the sandbox on a secondary thread and exposes a function to synchronize the generation of fuzzing inputs with their consumption by the sandbox.

---
 arch/sandbox/config.mk                    |  3 +
 arch/sandbox/cpu/os.c                     | 70 +++++++++++++++++++++++
 arch/sandbox/include/asm/fuzzing_engine.h | 25 ++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 arch/sandbox/include/asm/fuzzing_engine.h
arch/sandbox/config.mk +3 -0
index 410603252e..3e2c7f9ebe 100644
@@ -19,6 +19,9 @@ SANITIZERS :=
 ifdef CONFIG_ASAN
 SANITIZERS	+= -fsanitize=address
 endif
+ifdef CONFIG_FUZZ
+SANITIZERS	+= -fsanitize=fuzzer
+endif
 KBUILD_CFLAGS	+= $(SANITIZERS)
 
 cmd_u-boot__ = $(CC) -o $@ -Wl,-T u-boot.lds $(u-boot-init) \
arch/sandbox/cpu/os.c +70 -0

89 lines not on this page · raw message

arch/sandbox/include/asm/fuzzing_engine.h new file +25 -0
new file mode 100644
index 0000000000..cf6396363b
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (c) 2022 Google, Inc.
+ * Written by Andrew Scull <[email protected]>
+ */
+
+#ifndef __ASM_FUZZING_ENGINE_H
+#define __ASM_FUZZING_ENGINE_H
+
+/** Function to get fuzzing engine input data. */
+/**
+ * sandbox_fuzzing_engine_get_input() - get an input from the sandbox fuzzing
+ * 					engine
+ *
+ * The function will return a pointer to the input data and the size of the
+ * data pointed to. The pointer will remain valid until the next invocation of
+ * this function.
+ *
+ * @data:	output pointer to input data
+ * @size	output size of input data
+ * Return:	0 if OK, -ve on error
+ */
+int sandbox_fuzzing_engine_get_input(const uint8_t **data, size_t *size);
+
+#endif /* __ASM_FUZZING_ENGINE_H */
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#14 lore raw

PATCH v3 12/13 sandbox: Implement fuzzing engine driver

In reply to Andrew Scull

Add a fuzzing engine driver for the sandbox to take inputs from libfuzzer and expose them to the fuzz tests.

---
 arch/Kconfig                          |  2 ++
 arch/sandbox/dts/test.dts             |  4 +++
 drivers/fuzz/Kconfig                  | 16 +++++++++---
 drivers/fuzz/Makefile                 |  1 +
 drivers/fuzz/sandbox_fuzzing_engine.c | 35 +++++++++++++++++++++++++++
 5 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 drivers/fuzz/sandbox_fuzzing_engine.c
arch/Kconfig +2 -0
index 12de8a1165..8eaf853e4d 100644
@@ -135,6 +135,7 @@ config SANDBOX
 	select BZIP2
 	select CMD_POWEROFF
 	select DM
+	select DM_FUZZING_ENGINE
 	select DM_GPIO
 	select DM_I2C
 	select DM_KEYBOARD
@@ -170,6 +171,7 @@ config SANDBOX
 	imply CRC32_VERIFY
 	imply FAT_WRITE
 	imply FIRMWARE
+	imply FUZZING_ENGINE_SANDBOX
 	imply HASH_VERIFY
 	imply LZMA
 	imply TEE
arch/sandbox/dts/test.dts +4 -0
index 8f93775ff4..8662017d17 100644
@@ -89,6 +89,10 @@
 		};
 	};
 
+	fuzzing-engine {
+		compatible = "sandbox,fuzzing-engine";
+	};
+
 	reboot-mode0 {
 		compatible = "reboot-mode-gpio";
 		gpios = <&gpio_c 0 GPIO_ACTIVE_HIGH>, <&gpio_c 1 GPIO_ACTIVE_HIGH>;
drivers/fuzz/Kconfig +12 -4
index a03120f63a..6311385222 100644
@@ -3,7 +3,15 @@ config DM_FUZZING_ENGINE
 	depends on DM
 	help
 	  Enable driver model for fuzzing engine devices. This interface is
-	  used to get successive inputs from a fuzzing engine that aims to
-	  explore different code paths in a fuzz test. The fuzzing engine may
-	  be instrumenting the execution in order to more effectively generate
-	  inputs that explore different code paths.
+	  used to get fuzzing inputs from a fuzzing engine.
+
+if DM_FUZZING_ENGINE
+
+config FUZZING_ENGINE_SANDBOX
+	bool "Sanbox fuzzing engine"
+	depends on SANDBOX
+	default y
+	help
+	  Enable fuzzing engine for sandbox.
+
+endif
drivers/fuzz/Makefile +1 -0
index acd894999c..073743ba94 100644
@@ -5,3 +5,4 @@
 #
 
 obj-$(CONFIG_DM_FUZZING_ENGINE) += fuzzing_engine-uclass.o
+obj-$(CONFIG_FUZZING_ENGINE_SANDBOX) += sandbox_fuzzing_engine.o
drivers/fuzz/sandbox_fuzzing_engine.c new file +35 -0
new file mode 100644
index 0000000000..ebb938e5ba
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (c) 2022 Google, Inc.
+ * Written by Andrew Scull <[email protected]>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <fuzzing_engine.h>
+#include <asm/fuzzing_engine.h>
+
+static int get_input(struct udevice *dev,
+		     const uint8_t **data,
+		     size_t *size)
+{
+	return sandbox_fuzzing_engine_get_input(data, size);
+}
+
+static const struct dm_fuzzing_engine_ops sandbox_fuzzing_engine_ops = {
+	.get_input = get_input,
+};
+
+static const struct udevice_id sandbox_fuzzing_engine_match[] = {
+	{
+		.compatible = "sandbox,fuzzing-engine",
+	},
+	{},
+};
+
+U_BOOT_DRIVER(sandbox_fuzzing_engine) = {
+	.name = "sandbox-fuzzing-engine",
+	.id = UCLASS_FUZZING_ENGINE,
+	.of_match = sandbox_fuzzing_engine_match,
+	.ops = &sandbox_fuzzing_engine_ops,
+};
Signature · 1 line
2.36.1.124.g0e6072fb45-goog
#15 lore raw

PATCH v3 13/13 fuzz: virtio: Add fuzzer for vring

In reply to Andrew Scull

Add a fuzzer to test the vring handling code against unexpected mutations from the virtio device.

After building the sandbox with CONFIG_FUZZ=y, the fuzzer can be invoked with by:

UBOOT_SB_FUZZ_TEST=fuzz_vring ./u-boot

This fuzzer finds unvalidated inputs in the vring driver that allow a buggy or malicious device to make the driver chase wild pointers.

---
 test/fuzz/Makefile |  1 +
 test/fuzz/virtio.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 test/fuzz/virtio.c
test/fuzz/Makefile +1 -0
index 03eeeeb497..663b79ce80 100644
@@ -5,3 +5,4 @@
 #
 
 obj-$(CONFIG_$(SPL_)CMDLINE) += cmd_fuzz.o
+obj-$(CONFIG_VIRTIO_SANDBOX) += virtio.o
test/fuzz/virtio.c new file +72 -0

72 lines not on this page · raw message

Signature · 1 line
2.36.1.124.g0e6072fb45-goog
Reviewed-by on v3 1/13
#2 lore raw

Re: [PATCH v3 01/13] serial: sandbox: Fix buffer underflow in puts

In reply to Andrew Scull
Quoted 16 lines · Andrew Scull

Fix the buffer underflow that would occur if puts is called with length of zero.

Fixes efa51f2bd64 ("serial: sandbox: Implement puts")
Cc Sean Anderson <[email protected]>
Cc Simon Glass <[email protected]>
---
 drivers/serial/sandbox.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/serial/sandbox.c +0 -0
index e726e19c46..13b54921c4 100644

drivers/serial/sandbox.c static ssize_t sandbox_serial_puts(struct udevice *dev, const char *s, · line 120

Quoted 8 lines
drivers/serial/sandbox.c +1 -1
@@ -114,7 +114,7 @@ static ssize_t sandbox_serial_puts(struct udevice *dev, const char *s,
 	struct sandbox_serial_priv *priv = dev_get_priv(dev);
 	ssize_t ret;
 
-	if (s[len - 1] == '\n')
+	if (len && s[len - 1] == '\n')
 		priv->start_of_line = true;
 
 	if (sandbox_serial_enabled) {
#16 lore raw
In reply to Andrew Scull

Hi Andrew,

Quoted 136 lines · Andrew Scull

This series introduces ASAN and a basic fuzzing infrastructure that works with sandbox. The example fuzz test towards the end of the series will find something pretty quickly. That something is fixed by the series "virtio: Harden and test vring" that needs to be applied for the final patch in this series.

There is some refactoring to stop using '.' prefixed sections. ELF defines sections with names that contain anything that isn't alphanumeric or an underscore as being for system use which means clang's ASAN instrumentation happily add redzones between the contained objects. That's not what we want for things like linker lists where the linker script has carefully placed the sections contiguously. By renaming the sections, clang sees them as user sections and doesn't add instrumentation.

ASAN is left disabled by default as there are still some tests that it triggers on and will need some more investigation to fix. It can be enabled with CONFIG_ASAN or passing -a ASAN to buildman.

I abandonded the previous attempts to refactor sandbox EFI and getopt declaration as the changes resulted in problems out of the scope of this CL. I haven't tried to understand what EFI on sandbox should look like, but I have found that the linker list implementation is very brittle when up against compiler optimisation since ef123c5253 started to use static, zero-length arrays to mark the beginning and end of lists but the compiler see this as something it can get rid of.

From v1:
- corrected handling of EFI symbols by sandbox linker script
- per comments, some renaming and explaining
- dropped RFC for dlmalloc ASAN instrumentation (work required to improve it)
- added patch to reduce logging noise in fuzzer

From v2:
- remove sandbox EFI and getopt refactoring, they obstruct the series
- resolve a couple more ASAN errors
- fix LTO, xtensa and MIPS builds
- add ASAN build targets for CI

Andrew Scull (13):
serial: sandbox: Fix buffer underflow in puts
sandbox: Rename EFI runtime sections
sandbox: Rename getopt sections
linker_lists: Rename sections to remove . prefix
sandbox: Add support for Address Sanitizer test/py: test_stackprotector: Disable for ASAN
CI: Azure: Build with ASAN enabled
fuzzing_engine: Add fuzzing engine uclass
test: fuzz: Add framework for fuzzing
sandbox: Decouple program entry from sandbox init
sandbox: Add libfuzzer integration
sandbox: Implement fuzzing engine driver
fuzz: virtio: Add fuzzer for vring

 .azure-pipelines.yml                          |  6 ++
 Kconfig                                       | 16 ++++
 arch/Kconfig                                  |  2 +
 arch/arc/cpu/u-boot.lds                       |  4 +-
 arch/arm/config.mk                            |  4 +-
 arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds   |  4 +-
 arch/arm/cpu/armv7/sunxi/u-boot-spl.lds       |  4 +-
 arch/arm/cpu/armv8/u-boot-spl.lds             |  4 +-
 arch/arm/cpu/armv8/u-boot.lds                 |  4 +-
 arch/arm/cpu/u-boot-spl.lds                   |  4 +-
 arch/arm/cpu/u-boot.lds                       |  6 +-
 arch/arm/mach-at91/arm926ejs/u-boot-spl.lds   |  2 +-
 arch/arm/mach-at91/armv7/u-boot-spl.lds       |  2 +-
 arch/arm/mach-omap2/u-boot-spl.lds            |  4 +-
 arch/arm/mach-orion5x/u-boot-spl.lds          |  4 +-
 arch/arm/mach-rockchip/u-boot-tpl-v8.lds      |  4 +-
 arch/arm/mach-zynq/u-boot-spl.lds             |  4 +-
 arch/arm/mach-zynq/u-boot.lds                 |  4 +-
 arch/m68k/cpu/u-boot.lds                      |  4 +-
 arch/microblaze/cpu/u-boot-spl.lds            |  4 +-
 arch/microblaze/cpu/u-boot.lds                |  4 +-
 arch/mips/config.mk                           |  2 +-
 arch/mips/cpu/u-boot-spl.lds                  |  4 +-
 arch/mips/cpu/u-boot.lds                      |  4 +-
 arch/nios2/cpu/u-boot.lds                     |  4 +-
 arch/powerpc/cpu/mpc83xx/u-boot.lds           |  4 +-
 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds       |  4 +-
 arch/powerpc/cpu/mpc85xx/u-boot.lds           |  4 +-
 arch/riscv/cpu/u-boot-spl.lds                 |  4 +-
 arch/riscv/cpu/u-boot.lds                     |  4 +-
 arch/sandbox/config.mk                        | 21 ++++-
 arch/sandbox/cpu/os.c                         | 76 +++++++++++++++++
 arch/sandbox/cpu/start.c                      |  2 +-
 arch/sandbox/cpu/u-boot-spl.lds               | 10 +--
 arch/sandbox/cpu/u-boot.lds                   | 32 ++++----
 arch/sandbox/dts/test.dts                     |  4 +
 arch/sandbox/include/asm/fuzzing_engine.h     | 25 ++++++
 arch/sandbox/include/asm/getopt.h             |  2 +-
 arch/sandbox/include/asm/main.h               | 18 ++++
 arch/sandbox/include/asm/sections.h           |  4 +-
 arch/sandbox/lib/sections.c                   |  8 +-
 arch/sh/cpu/u-boot.lds                        |  4 +-
 arch/x86/cpu/u-boot-64.lds                    |  6 +-
 arch/x86/cpu/u-boot-spl.lds                   |  6 +-
 arch/x86/cpu/u-boot.lds                       |  6 +-
 arch/x86/lib/elf_ia32_efi.lds                 |  4 +-
 arch/x86/lib/elf_x86_64_efi.lds               |  4 +-
 arch/xtensa/cpu/u-boot.lds                    |  4 +-
 arch/xtensa/include/asm/ldscript.h            | 13 ++-
 board/compulab/cm_t335/u-boot.lds             |  4 +-
 board/cssi/MCR3000/u-boot.lds                 |  4 +-
 .../davinci/da8xxevm/u-boot-spl-da850evm.lds  |  2 +-
 board/qualcomm/dragonboard820c/u-boot.lds     |  4 +-
 board/samsung/common/exynos-uboot-spl.lds     |  4 +-
 board/synopsys/iot_devkit/u-boot.lds          |  4 +-
 board/ti/am335x/u-boot.lds                    |  4 +-
 board/vscom/baltos/u-boot.lds                 |  4 +-
 doc/api/linker_lists.rst                      | 22 ++---
 doc/develop/commands.rst                      |  4 +-
 doc/develop/driver-model/of-plat.rst          |  4 +-
 drivers/Kconfig                               |  2 +
 drivers/Makefile                              |  1 +
 drivers/fuzz/Kconfig                          | 17 ++++
 drivers/fuzz/Makefile                         |  8 ++
 drivers/fuzz/fuzzing_engine-uclass.c          | 28 +++++++
 drivers/fuzz/sandbox_fuzzing_engine.c         | 35 ++++++++
 drivers/serial/sandbox.c                      |  2 +-
 include/dm/uclass-id.h                        |  1 +
 include/fuzzing_engine.h                      | 51 ++++++++++++
 include/linker_lists.h                        | 18 ++--
 include/test/fuzz.h                           | 51 ++++++++++++
 test/Makefile                                 |  1 +
 test/fuzz/Makefile                            |  8 ++
 test/fuzz/cmd_fuzz.c                          | 82 +++++++++++++++++++
 test/fuzz/virtio.c                            | 72 ++++++++++++++++
 test/py/tests/test_stackprotector.py          |  1 +
 tools/mips-relocs.c                           |  9 +-
 77 files changed, 673 insertions(+), 151 deletions(-)
 create mode 100644 arch/sandbox/include/asm/fuzzing_engine.h
 create mode 100644 arch/sandbox/include/asm/main.h
 create mode 100644 drivers/fuzz/Kconfig
Quoted 8 lines
 create mode 100644 drivers/fuzz/Makefile
 create mode 100644 drivers/fuzz/fuzzing_engine-uclass.c
 create mode 100644 drivers/fuzz/sandbox_fuzzing_engine.c
 create mode 100644 include/fuzzing_engine.h
 create mode 100644 include/test/fuzz.h
 create mode 100644 test/fuzz/Makefile
 create mode 100644 test/fuzz/cmd_fuzz.c
 create mode 100644 test/fuzz/virtio.c

Could you please add some documentation about this in doc/ ? I also wonder if we can make the fuzz test run in CI? Finally, can the azure stuff work in gitlab too?

I am interested in using fuzzing to test a new 'Universal Payload' feature which basically converts data from a C struct to a devicetree and back.

Regards,
Simon

#17 lore raw
Quoted 148 lines · Simon Glass

Hi Andrew,

Quoted 136 lines · Andrew Scull

This series introduces ASAN and a basic fuzzing infrastructure that works with sandbox. The example fuzz test towards the end of the series will find something pretty quickly. That something is fixed by the series "virtio: Harden and test vring" that needs to be applied for the final patch in this series.

There is some refactoring to stop using '.' prefixed sections. ELF defines sections with names that contain anything that isn't alphanumeric or an underscore as being for system use which means clang's ASAN instrumentation happily add redzones between the contained objects. That's not what we want for things like linker lists where the linker script has carefully placed the sections contiguously. By renaming the sections, clang sees them as user sections and doesn't add instrumentation.

ASAN is left disabled by default as there are still some tests that it triggers on and will need some more investigation to fix. It can be enabled with CONFIG_ASAN or passing -a ASAN to buildman.

I abandonded the previous attempts to refactor sandbox EFI and getopt declaration as the changes resulted in problems out of the scope of this CL. I haven't tried to understand what EFI on sandbox should look like, but I have found that the linker list implementation is very brittle when up against compiler optimisation since ef123c5253 started to use static, zero-length arrays to mark the beginning and end of lists but the compiler see this as something it can get rid of.

From v1:
- corrected handling of EFI symbols by sandbox linker script
- per comments, some renaming and explaining
- dropped RFC for dlmalloc ASAN instrumentation (work required to improve it)
- added patch to reduce logging noise in fuzzer

From v2:
- remove sandbox EFI and getopt refactoring, they obstruct the series
- resolve a couple more ASAN errors
- fix LTO, xtensa and MIPS builds
- add ASAN build targets for CI

Andrew Scull (13):
serial: sandbox: Fix buffer underflow in puts
sandbox: Rename EFI runtime sections
sandbox: Rename getopt sections
linker_lists: Rename sections to remove . prefix
sandbox: Add support for Address Sanitizer test/py: test_stackprotector: Disable for ASAN
CI: Azure: Build with ASAN enabled
fuzzing_engine: Add fuzzing engine uclass
test: fuzz: Add framework for fuzzing
sandbox: Decouple program entry from sandbox init
sandbox: Add libfuzzer integration
sandbox: Implement fuzzing engine driver
fuzz: virtio: Add fuzzer for vring

 .azure-pipelines.yml                          |  6 ++
 Kconfig                                       | 16 ++++
 arch/Kconfig                                  |  2 +
 arch/arc/cpu/u-boot.lds                       |  4 +-
 arch/arm/config.mk                            |  4 +-
 arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds   |  4 +-
 arch/arm/cpu/armv7/sunxi/u-boot-spl.lds       |  4 +-
 arch/arm/cpu/armv8/u-boot-spl.lds             |  4 +-
 arch/arm/cpu/armv8/u-boot.lds                 |  4 +-
 arch/arm/cpu/u-boot-spl.lds                   |  4 +-
 arch/arm/cpu/u-boot.lds                       |  6 +-
 arch/arm/mach-at91/arm926ejs/u-boot-spl.lds   |  2 +-
 arch/arm/mach-at91/armv7/u-boot-spl.lds       |  2 +-
 arch/arm/mach-omap2/u-boot-spl.lds            |  4 +-
 arch/arm/mach-orion5x/u-boot-spl.lds          |  4 +-
 arch/arm/mach-rockchip/u-boot-tpl-v8.lds      |  4 +-
 arch/arm/mach-zynq/u-boot-spl.lds             |  4 +-
 arch/arm/mach-zynq/u-boot.lds                 |  4 +-
 arch/m68k/cpu/u-boot.lds                      |  4 +-
 arch/microblaze/cpu/u-boot-spl.lds            |  4 +-
 arch/microblaze/cpu/u-boot.lds                |  4 +-
 arch/mips/config.mk                           |  2 +-
 arch/mips/cpu/u-boot-spl.lds                  |  4 +-
 arch/mips/cpu/u-boot.lds                      |  4 +-
 arch/nios2/cpu/u-boot.lds                     |  4 +-
 arch/powerpc/cpu/mpc83xx/u-boot.lds           |  4 +-
 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds       |  4 +-
 arch/powerpc/cpu/mpc85xx/u-boot.lds           |  4 +-
 arch/riscv/cpu/u-boot-spl.lds                 |  4 +-
 arch/riscv/cpu/u-boot.lds                     |  4 +-
 arch/sandbox/config.mk                        | 21 ++++-
 arch/sandbox/cpu/os.c                         | 76 +++++++++++++++++
 arch/sandbox/cpu/start.c                      |  2 +-
 arch/sandbox/cpu/u-boot-spl.lds               | 10 +--
 arch/sandbox/cpu/u-boot.lds                   | 32 ++++----
 arch/sandbox/dts/test.dts                     |  4 +
 arch/sandbox/include/asm/fuzzing_engine.h     | 25 ++++++
 arch/sandbox/include/asm/getopt.h             |  2 +-
 arch/sandbox/include/asm/main.h               | 18 ++++
 arch/sandbox/include/asm/sections.h           |  4 +-
 arch/sandbox/lib/sections.c                   |  8 +-
 arch/sh/cpu/u-boot.lds                        |  4 +-
 arch/x86/cpu/u-boot-64.lds                    |  6 +-
 arch/x86/cpu/u-boot-spl.lds                   |  6 +-
 arch/x86/cpu/u-boot.lds                       |  6 +-
 arch/x86/lib/elf_ia32_efi.lds                 |  4 +-
 arch/x86/lib/elf_x86_64_efi.lds               |  4 +-
 arch/xtensa/cpu/u-boot.lds                    |  4 +-
 arch/xtensa/include/asm/ldscript.h            | 13 ++-
 board/compulab/cm_t335/u-boot.lds             |  4 +-
 board/cssi/MCR3000/u-boot.lds                 |  4 +-
 .../davinci/da8xxevm/u-boot-spl-da850evm.lds  |  2 +-
 board/qualcomm/dragonboard820c/u-boot.lds     |  4 +-
 board/samsung/common/exynos-uboot-spl.lds     |  4 +-
 board/synopsys/iot_devkit/u-boot.lds          |  4 +-
 board/ti/am335x/u-boot.lds                    |  4 +-
 board/vscom/baltos/u-boot.lds                 |  4 +-
 doc/api/linker_lists.rst                      | 22 ++---
 doc/develop/commands.rst                      |  4 +-
 doc/develop/driver-model/of-plat.rst          |  4 +-
 drivers/Kconfig                               |  2 +
 drivers/Makefile                              |  1 +
 drivers/fuzz/Kconfig                          | 17 ++++
 drivers/fuzz/Makefile                         |  8 ++
 drivers/fuzz/fuzzing_engine-uclass.c          | 28 +++++++
 drivers/fuzz/sandbox_fuzzing_engine.c         | 35 ++++++++
 drivers/serial/sandbox.c                      |  2 +-
 include/dm/uclass-id.h                        |  1 +
 include/fuzzing_engine.h                      | 51 ++++++++++++
 include/linker_lists.h                        | 18 ++--
 include/test/fuzz.h                           | 51 ++++++++++++
 test/Makefile                                 |  1 +
 test/fuzz/Makefile                            |  8 ++
 test/fuzz/cmd_fuzz.c                          | 82 +++++++++++++++++++
 test/fuzz/virtio.c                            | 72 ++++++++++++++++
 test/py/tests/test_stackprotector.py          |  1 +
 tools/mips-relocs.c                           |  9 +-
 77 files changed, 673 insertions(+), 151 deletions(-)
 create mode 100644 arch/sandbox/include/asm/fuzzing_engine.h
 create mode 100644 arch/sandbox/include/asm/main.h
 create mode 100644 drivers/fuzz/Kconfig
Quoted 8 lines
 create mode 100644 drivers/fuzz/Makefile
 create mode 100644 drivers/fuzz/fuzzing_engine-uclass.c
 create mode 100644 drivers/fuzz/sandbox_fuzzing_engine.c
 create mode 100644 include/fuzzing_engine.h
 create mode 100644 include/test/fuzz.h
 create mode 100644 test/fuzz/Makefile
 create mode 100644 test/fuzz/cmd_fuzz.c
 create mode 100644 test/fuzz/virtio.c
Quoted 7 lines

Could you please add some documentation about this in doc/ ? I also wonder if we can make the fuzz test run in CI? Finally, can the azure stuff work in gitlab too?

I am interested in using fuzzing to test a new 'Universal Payload' feature which basically converts data from a C struct to a devicetree and back.

Fuzzing fails on a number of tests, which is why I've moved it to just run the version test here:
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/

There's not much point in running it in GitLab too until we get the errors fixed.

Signature · 1 line
Tom