nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-09-19 22:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix out-of-bounds partition r/w bugs in raw_dev.c

Browse source
This commit is contained in:
TuxSH 2018-05-17 14:39:16 +02:00
parent 858b40e5fb
commit 5631b27449
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
fusee/fusee-secondary/src/raw_dev.c
View file

@ -237,7 +237,7 @@ static ssize_t rawdev_write(struct _reent *r, void *fd, const char *ptr, size_t
size_t sector_size = device->devpart.sector_size; size_t sector_size = device->devpart.sector_size;
uint64_t sector_begin = f->offset / sector_size; uint64_t sector_begin = f->offset / sector_size;
uint64_t sector_end = (f->offset + len + sector_size - 1) / sector_size; uint64_t sector_end = (f->offset + len + sector_size - 1) / sector_size;
uint64_t sector_end_aligned = sector_end - ((f->offset + len) % sector_size != 0 ? 1 : 0); uint64_t sector_end_aligned;
uint64_t current_sector = sector_begin; uint64_t current_sector = sector_begin;
const uint8_t *data = (const uint8_t *)ptr; const uint8_t *data = (const uint8_t *)ptr;
@ -245,6 +245,13 @@ static ssize_t rawdev_write(struct _reent *r, void *fd, const char *ptr, size_t
if (sector_end >= device->devpart.num_sectors) { if (sector_end >= device->devpart.num_sectors) {
len = (size_t)(sector_size * device->devpart.num_sectors - f->offset); len = (size_t)(sector_size * device->devpart.num_sectors - f->offset);
sector_end = device->devpart.num_sectors;
}
sector_end_aligned = sector_end - ((f->offset + len) % sector_size != 0 ? 1 : 0);
if (len == 0) {
return 0;
} }
/* Unaligned at the start, we need to read the sector and incorporate the data. */ /* Unaligned at the start, we need to read the sector and incorporate the data. */
@ -311,13 +318,14 @@ static ssize_t rawdev_write(struct _reent *r, void *fd, const char *ptr, size_t
f->offset += len; f->offset += len;
return len; return len;
} }
static ssize_t rawdev_read(struct _reent *r, void *fd, char *ptr, size_t len) { static ssize_t rawdev_read(struct _reent *r, void *fd, char *ptr, size_t len) {
rawdev_file_t *f = (rawdev_file_t *)fd; rawdev_file_t *f = (rawdev_file_t *)fd;
rawdev_device_t *device = f->device; rawdev_device_t *device = f->device;
size_t sector_size = device->devpart.sector_size; size_t sector_size = device->devpart.sector_size;
uint64_t sector_begin = f->offset / sector_size; uint64_t sector_begin = f->offset / sector_size;
uint64_t sector_end = (f->offset + len + sector_size - 1) / sector_size; uint64_t sector_end = (f->offset + len + sector_size - 1) / sector_size;
uint64_t sector_end_aligned = sector_end - ((f->offset + len) % sector_size != 0 ? 1 : 0); uint64_t sector_end_aligned;
uint64_t current_sector = sector_begin; uint64_t current_sector = sector_begin;
uint8_t *data = (uint8_t *)ptr; uint8_t *data = (uint8_t *)ptr;
@ -325,6 +333,13 @@ static ssize_t rawdev_read(struct _reent *r, void *fd, char *ptr, size_t len) {
if (sector_end >= device->devpart.num_sectors) { if (sector_end >= device->devpart.num_sectors) {
len = (size_t)(sector_size * device->devpart.num_sectors - f->offset); len = (size_t)(sector_size * device->devpart.num_sectors - f->offset);
sector_end = device->devpart.num_sectors;
}
sector_end_aligned = sector_end - ((f->offset + len) % sector_size != 0 ? 1 : 0);
if (len == 0) {
return 0;
} }
/* Unaligned at the start, we need to read the sector and incorporate the data. */ /* Unaligned at the start, we need to read the sector and incorporate the data. */