Merge "Fix buffer overflow in blk_alloc_to_base_fs"