X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Ffiledisk.c;h=15f4f6a00bd49515f8abbad1189de4688c88d89c;hb=60ad6a41c6d0ee08ed689e8505eb0c3df0c2a289;hp=001f1da729dad7d839455ac30ff41b5513bb9302;hpb=72420d58d18ec71d4777d029daaf0c6a1c820b32;p=palacios.git diff --git a/palacios/src/devices/filedisk.c b/palacios/src/devices/filedisk.c index 001f1da..15f4f6a 100644 --- a/palacios/src/devices/filedisk.c +++ b/palacios/src/devices/filedisk.c @@ -20,10 +20,10 @@ #include #include -#include +#include #include -#ifndef CONFIG_DEBUG_FILEDISK +#ifndef V3_CONFIG_DEBUG_FILEDISK #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -36,16 +36,16 @@ struct disk_state { -static int write_all(v3_file_t fd, char * buf, int offset, int length) { - int bytes_written = 0; +static int write_all(v3_file_t fd, char * buf, uint64_t offset, uint64_t length) { + uint64_t bytes_written = 0; - PrintDebug("Writing %d bytes\n", length - bytes_written); + PrintDebug(VM_NONE, VCORE_NONE, "Writing %llu bytes\n", length - bytes_written); while (bytes_written < length) { int tmp_bytes = v3_file_write(fd, buf + bytes_written, length - bytes_written, offset + bytes_written); - PrintDebug("Wrote %d bytes\n", tmp_bytes); + PrintDebug(VM_NONE, VCORE_NONE, "Wrote %d bytes\n", tmp_bytes); if (tmp_bytes <= 0 ) { - PrintError("Write failed\n"); + PrintError(VM_NONE, VCORE_NONE, "Write failed\n"); return -1; } @@ -56,16 +56,16 @@ static int write_all(v3_file_t fd, char * buf, int offset, int length) { } -static int read_all(v3_file_t fd, char * buf, int offset, int length) { - int bytes_read = 0; +static int read_all(v3_file_t fd, char * buf, uint64_t offset, uint64_t length) { + uint64_t bytes_read = 0; - PrintDebug("Reading %d bytes\n", length - bytes_read); + PrintDebug(VM_NONE, VCORE_NONE, "Reading %llu bytes\n", length - bytes_read); while (bytes_read < length) { int tmp_bytes = v3_file_read(fd, buf + bytes_read, length - bytes_read, offset + bytes_read); - PrintDebug("Read %d bytes\n", tmp_bytes); + PrintDebug(VM_NONE, VCORE_NONE, "Read %d bytes\n", tmp_bytes); if (tmp_bytes <= 0) { - PrintError("Read failed\n"); + PrintError(VM_NONE, VCORE_NONE, "Read failed\n"); return -1; } @@ -78,7 +78,13 @@ static int read_all(v3_file_t fd, char * buf, int offset, int length) { static int read(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data) { struct disk_state * disk = (struct disk_state *)private_data; - PrintDebug("Reading %d bytes from %p to %p\n", (uint32_t)num_bytes, (uint8_t *)(disk->disk_image + lba), buf); + PrintDebug(VM_NONE, VCORE_NONE, "Reading %llu bytes from %llu to 0x%p\n", num_bytes, lba, buf); + + if (lba + num_bytes > disk->capacity) { + PrintError(VM_NONE, VCORE_NONE, "Out of bounds read: lba=%llu, num_bytes=%llu, capacity=%llu\n", + lba, num_bytes, disk->capacity); + return -1; + } return read_all(disk->fd, buf, lba, num_bytes); } @@ -87,7 +93,14 @@ static int read(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_ static int write(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data) { struct disk_state * disk = (struct disk_state *)private_data; - PrintDebug("Writing %d bytes from %p to %p\n", (uint32_t)num_bytes, buf, (uint8_t *)(disk->disk_image + lba)); + PrintDebug(VM_NONE, VCORE_NONE, "Writing %llu bytes from 0x%p to %llu\n", num_bytes, buf, lba); + + if (lba + num_bytes > disk->capacity) { + PrintError(VM_NONE, VCORE_NONE, "Out of bounds read: lba=%llu, num_bytes=%llu, capacity=%llu\n", + lba, num_bytes, disk->capacity); + return -1; + } + return write_all(disk->fd, buf, lba, num_bytes); } @@ -96,8 +109,7 @@ static int write(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private static uint64_t get_capacity(void * private_data) { struct disk_state * disk = (struct disk_state *)private_data; - PrintDebug("Querying RAMDISK capacity %d\n", - (uint32_t)(disk->capacity)); + PrintDebug(VM_NONE, VCORE_NONE, "Querying FILEDISK capacity %llu\n", disk->capacity); return disk->capacity; } @@ -111,9 +123,7 @@ static struct v3_dev_blk_ops blk_ops = { -static int disk_free(struct vm_device * dev) { - struct disk_state * disk = dev->private_data; - +static int disk_free(struct disk_state * disk) { v3_file_close(disk->fd); V3_Free(disk); @@ -121,7 +131,7 @@ static int disk_free(struct vm_device * dev) { } static struct v3_device_ops dev_ops = { - .free = disk_free, + .free = (int (*)(void *))disk_free, }; @@ -132,22 +142,25 @@ static int disk_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { char * path = v3_cfg_val(cfg, "path"); char * dev_id = v3_cfg_val(cfg, "ID"); char * writable = v3_cfg_val(cfg, "writable"); + char * writeable = v3_cfg_val(cfg, "writeable"); + v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend"); int flags = FILE_OPEN_MODE_READ; - if ( (writable) && (writable[0] == '1') ) { + if ( ((writable) && (writable[0] == '1')) || + ((writeable) && (writeable[0] == '1')) ) { flags |= FILE_OPEN_MODE_WRITE; } if (path == NULL) { - PrintError("Missing path (%s) for %s\n", path, dev_id); + PrintError(vm, VCORE_NONE, "Missing path (%s) for %s\n", path, dev_id); return -1; } disk = (struct disk_state *)V3_Malloc(sizeof(struct disk_state)); if (disk == NULL) { - PrintError("Could not allocate disk\n"); + PrintError(vm, VCORE_NONE, "Could not allocate disk\n"); return -1; } @@ -156,7 +169,7 @@ static int disk_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, disk); if (dev == NULL) { - PrintError("Could not attach device %s\n", dev_id); + PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id); V3_Free(disk); return -1; } @@ -165,20 +178,21 @@ static int disk_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { disk->fd = v3_file_open(vm, path, flags); if (disk->fd == NULL) { - PrintError("Could not open file disk:%s\n", path); + PrintError(vm, VCORE_NONE, "Could not open file disk:%s\n", path); v3_remove_device(dev); return -1; } disk->capacity = v3_file_size(disk->fd); - PrintDebug("Registering FILEDISK %s (path=%s, fd=%lu, size=%lu)\n", - dev_id, path, file->fd, file->capacity); + V3_Print(vm, VCORE_NONE, "Registering FILEDISK %s (path=%s, fd=%lu, size=%llu, writeable=%d)\n", + dev_id, path, (addr_t)disk->fd, disk->capacity, + flags & FILE_OPEN_MODE_WRITE); if (v3_dev_connect_blk(vm, v3_cfg_val(frontend_cfg, "tag"), &blk_ops, frontend_cfg, disk) == -1) { - PrintError("Could not connect %s to frontend %s\n", + PrintError(vm, VCORE_NONE, "Could not connect %s to frontend %s\n", dev_id, v3_cfg_val(frontend_cfg, "tag")); v3_remove_device(dev); return -1;