summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2025-04-21 22:37:42 -0400
committerFreya Murphy <freya@freyacat.org>2025-04-21 22:37:42 -0400
commit3fc8b4cc890da5edd55924a0e2be179e01fecc2c (patch)
tree0631b8f1938782ebef3263da40e0ec9cf994464d /kernel
parentmake fs use void* (diff)
downloadcomus-3fc8b4cc890da5edd55924a0e2be179e01fecc2c.tar.gz
comus-3fc8b4cc890da5edd55924a0e2be179e01fecc2c.tar.bz2
comus-3fc8b4cc890da5edd55924a0e2be179e01fecc2c.zip
fix kernel fs invalid err offset bug
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fs/fs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/fs/fs.c b/kernel/fs/fs.c
index 75bd0e9..5f53c6d 100644
--- a/kernel/fs/fs.c
+++ b/kernel/fs/fs.c
@@ -1,3 +1,4 @@
+#include "lib/kio.h"
#include <lib.h>
#include <comus/fs.h>
#include <comus/mboot.h>
@@ -126,7 +127,7 @@ static int disk_read_ata(struct disk *disk, size_t offset, size_t len,
return 1;
// copy over to buffer
- memcpy(buffer, atabuf + err, len);
+ memcpy(buffer, (char*)atabuf + err, len);
return ret;
}
@@ -185,7 +186,7 @@ static int disk_write_ata(struct disk *disk, size_t offset, size_t len,
return 1;
// copy custom data over
- memcpy(atabuf + err, buffer, len);
+ memcpy((char*)atabuf + err, buffer, len);
// write back sectors
if ((ret = ide_device_write_sectors(disk->ide, numsects,