Make fuzz_test_ramdisk() take the ramdisk sector size so the partition parser fuzzer can exercise both 512-byte and 4096-byte block devices.
Keep the existing fuzz-partitions target on 512-byte sectors and add fuzz-partitions-4k for the 4K-sector case. Assisted-by: Codex:gpt-5.5 Signed-off-by: Ahmad Fatoum <[email protected]> --- Documentation/devel/fuzzing.rst | 1 + common/partitions.c | 3 ++- images/Makefile.sandbox | 1 + include/fuzz.h | 9 +++++---- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Documentation/devel/fuzzing.rst b/Documentation/devel/fuzzing.rst index b475fd12fcea..a34d92b97e2e 100644 --- a/Documentation/devel/fuzzing.rst +++ b/Documentation/devel/fuzzing.rst @@ -25,6 +25,7 @@ options to crash barebox on detection of memory safety issues:: fuzz-dtb fuzz-fdt-compatible fuzz-partitions + fuzz-partitions-4k All fuzzers generated are symlinks to the same barebox executable. barebox will detect that it was invoked via symlink and switch to fuzzing mode. diff --git a/common/partitions.c b/common/partitions.c index 617c2770eadf..617b33460429 100644 --- a/common/partitions.c +++ b/common/partitions.c @@ -408,7 +408,8 @@ static int fuzz_partition_table_parser(struct block_device *ramdisk) free(buf); return 0; } -fuzz_test_ramdisk("partitions", fuzz_partition_table_parser); +fuzz_test_ramdisk("partitions", fuzz_partition_table_parser, 512); +fuzz_test_ramdisk("partitions-4k", fuzz_partition_table_parser, 4096); /** * cdev_unallocated_space - return unallocated space diff --git a/images/Makefile.sandbox b/images/Makefile.sandbox index 210a7bf48ac8..2af83b395f9f 100644 --- a/images/Makefile.sandbox +++ b/images/Makefile.sandbox @@ -9,6 +9,7 @@ fuzzer-$(CONFIG_FITIMAGE) += fit fuzzer-$(CONFIG_OFTREE) += dtb fuzzer-$(CONFIG_OFTREE) += fdt-compatible fuzzer-$(CONFIG_PARTITION) += partitions +fuzzer-$(CONFIG_PARTITION) += partitions-4k ifeq ($(CONFIG_SANDBOX),y) diff --git a/include/fuzz.h b/include/fuzz.h index 4d637f72b176..559e67a09b50 100644 --- a/include/fuzz.h +++ b/include/fuzz.h @@ -47,13 +47,14 @@ extern const struct fuzz_test __barebox_fuzz_tests_end; static __always_unused void * _unused##_func = _func #endif -#define fuzz_test_ramdisk(_name, _func) \ - static int _func##_ramdisk(const u8 *data, size_t size) \ +#define fuzz_test_ramdisk(_name, _func, _sector_size) \ + static int _func##_ramdisk_##_sector_size(const u8 *data, \ + size_t size) \ { \ static struct ramdisk *ramdisk; \ int ret; \ if (!ramdisk) \ - ramdisk = ramdisk_init(512); \ + ramdisk = ramdisk_init(_sector_size); \ if (!ramdisk) \ return -ENODEV; \ ramdisk_setup_ro(ramdisk, data, size); \ @@ -61,7 +62,7 @@ extern const struct fuzz_test __barebox_fuzz_tests_end; ramdisk_setup_ro(ramdisk, NULL, 0); \ return ret; \ } \ - fuzz_test(_name, _func##_ramdisk) + fuzz_test(_name, _func##_ramdisk_##_sector_size) #define fuzz_test_str(_name, _func) \ static int _func##_str(const u8 *_data, size_t size) \ -- 2.47.3
