]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
virtio_blk: set log2blksz correctly
authorAKASHI Takahiro <takahiro.akashi@linaro.org>
Wed, 19 Aug 2020 09:07:32 +0000 (18:07 +0900)
committerTom Rini <trini@konsulko.com>
Mon, 24 Aug 2020 18:11:31 +0000 (14:11 -0400)
'log2blksz' in blk_desc structure must always be initialized, otherwise
it will cause a lot of weird failures in file operations.

For example, fs_set_blk_dev[_with_part]() examines a block device against
every file system with its probe function. In particular, ext4 file
system's ext4_probe() will calls fs_devread() to fetch a super block.
If log2blksz is 0, the actual 'read' size, i.e. block_len >> log2blksz, is
much bigger than a buffer's size, and it can end up with memory corruption.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Fixes: f4802209e59d ("virtio: Add block driver support")
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
drivers/virtio/virtio_blk.c

index 992118c60758470c05c19cb3ac4b5ff1d67a4c00..1799f5c5eb36bb1ea23e0b0cf80c68e633d68889 100644 (file)
@@ -115,6 +115,7 @@ static int virtio_blk_probe(struct udevice *dev)
                return ret;
 
        desc->blksz = 512;
+       desc->log2blksz = 9;
        virtio_cread(dev, struct virtio_blk_config, capacity, &cap);
        desc->lba = cap;