Skip to content

Commit

Permalink
vvfat: fix ubsan issue in create_long_filename
Browse files Browse the repository at this point in the history
Found with test sbsaref introduced in [1].

[1] https://patchew.org/QEMU/[email protected]/

../block/vvfat.c:433:24: runtime error: index 14 out of bounds for type 'uint8_t [11]'
    #0 0x56151a66b93a in create_long_filename ../block/vvfat.c:433
    #1 0x56151a66f3d7 in create_short_and_long_name ../block/vvfat.c:725
    #2 0x56151a670403 in read_directory ../block/vvfat.c:804
    qemu#3 0x56151a674432 in init_directories ../block/vvfat.c:964
    qemu#4 0x56151a67867b in vvfat_open ../block/vvfat.c:1258
    qemu#5 0x56151a3b8e19 in bdrv_open_driver ../block.c:1660
    qemu#6 0x56151a3bb666 in bdrv_open_common ../block.c:1985
    qemu#7 0x56151a3cadb9 in bdrv_open_inherit ../block.c:4153
    qemu#8 0x56151a3c8850 in bdrv_open_child_bs ../block.c:3731
    qemu#9 0x56151a3ca832 in bdrv_open_inherit ../block.c:4098
    qemu#10 0x56151a3cbe40 in bdrv_open ../block.c:4248
    qemu#11 0x56151a46344f in blk_new_open ../block/block-backend.c:457
    qemu#12 0x56151a388bd9 in blockdev_init ../blockdev.c:612
    qemu#13 0x56151a38ab2d in drive_new ../blockdev.c:1006
    qemu#14 0x5615190fca41 in drive_init_func ../system/vl.c:649
    qemu#15 0x56151aa796dd in qemu_opts_foreach ../util/qemu-option.c:1135
    qemu#16 0x5615190fd2b6 in configure_blockdev ../system/vl.c:708
    qemu#17 0x56151910a307 in qemu_create_early_backends ../system/vl.c:2004
    qemu#18 0x561519113fcf in qemu_init ../system/vl.c:3685
    qemu#19 0x56151a7e438e in main ../system/main.c:47
    qemu#20 0x7f72d1a46249 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58
    qemu#21 0x7f72d1a46304 in __libc_start_main_impl ../csu/libc-start.c:360
    qemu#22 0x561517e98510 in _start (/home/user/.work/qemu/build/qemu-system-aarch64+0x3b9b510)

The offset used can easily go beyond entry->name size. It's probably a
bug, but I don't have the time to dive into vfat specifics for now.

This change solves the ubsan issue, and is functionally equivalent, as
anything written past the entry->name array would not be read anyway.

Signed-off-by: Pierrick Bouvier <[email protected]>
Reviewed-by: Michael Tokarev <[email protected]>
Signed-off-by: Michael Tokarev <[email protected]>
  • Loading branch information
pbo-linaro authored and Michael Tokarev committed Dec 28, 2024
1 parent 11ea52f commit 0cb3ff7
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions block/vvfat.c
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,10 @@ static direntry_t *create_long_filename(BDRVVVFATState *s, const char *filename)
else if(offset<22) offset=14+offset-10;
else offset=28+offset-22;
entry=array_get(&(s->directory),s->directory.next-1-(i/26));
/* ensure we don't write anything past entry->name */
if (offset >= sizeof(entry->name)) {
continue;
}
if (i >= 2 * length + 2) {
entry->name[offset] = 0xff;
} else if (i % 2 == 0) {
Expand Down

0 comments on commit 0cb3ff7

Please sign in to comment.