mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-02 07:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ext2: fix use after free

Browse Source
This commit is contained in:
Matheus
2024-08-03 11:34:58 -03:00
parent d447751c30
commit d874b2f75f
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/fs/ext2.c
+21 -6
View File
@@ -619,6 +619,7 @@ static int setinodeblock(ext2fs_t *fs, ext2node_t *node, uintmax_t index, blockp
size_t count; size_t count;
blockptr_t doublyptr = 0; blockptr_t doublyptr = 0;
blockptr_t singlyptr = 0; blockptr_t singlyptr = 0;
size_t writec;
int e = 0; int e = 0;
@@ -632,6 +633,10 @@ static int setinodeblock(ext2fs_t *fs, ext2node_t *node, uintmax_t index, blockp
e = allocandset(fs, node, BLOCK_GETDISKOFFSET(fs, node->inode.triplypointer) + triplyoffset, &doublyptr); e = allocandset(fs, node, BLOCK_GETDISKOFFSET(fs, node->inode.triplypointer) + triplyoffset, &doublyptr);
if (e) if (e)
return e; return e;
e = vfs_write(fs->backing, util_zerobuffer, fs->blocksize, BLOCK_GETDISKOFFSET(fs, doublyptr), &writec, 0);
if (e)
return e;
} else if (usetriply) { } else if (usetriply) {
// use already allocated triply // use already allocated triply
uintmax_t offset = BLOCK_GETDISKOFFSET(fs, node->inode.triplypointer) + triplyoffset; uintmax_t offset = BLOCK_GETDISKOFFSET(fs, node->inode.triplypointer) + triplyoffset;
@@ -640,10 +645,15 @@ static int setinodeblock(ext2fs_t *fs, ext2node_t *node, uintmax_t index, blockp
return e; return e;
// allocate doubly if needed // allocate doubly if needed
if (doublyptr == 0) if (doublyptr == 0) {
e = allocandset(fs, node, offset, &doublyptr); e = allocandset(fs, node, offset, &doublyptr);
if (e) if (e)
return e; return e;
e = vfs_write(fs->backing, util_zerobuffer, fs->blocksize, BLOCK_GETDISKOFFSET(fs, doublyptr), &writec, 0);
if (e)
return e;
}
} else { } else {
// no triply used, allocate doubly if needed // no triply used, allocate doubly if needed
if (node->inode.doublypointer == 0) if (node->inode.doublypointer == 0)
@@ -663,10 +673,15 @@ static int setinodeblock(ext2fs_t *fs, ext2node_t *node, uintmax_t index, blockp
return e; return e;
// allocate singly if needed // allocate singly if needed
if (singlyptr == 0) if (singlyptr == 0) {
e = allocandset(fs, node, offset, &singlyptr); e = allocandset(fs, node, offset, &singlyptr);
if (e) if (e)
return e; return e;
e = vfs_write(fs->backing, util_zerobuffer, fs->blocksize, BLOCK_GETDISKOFFSET(fs, singlyptr), &writec, 0);
if (e)
return e;
}
} else { } else {
// no doubly used, allocate singly if needed // no doubly used, allocate singly if needed
if (node->inode.singlypointer == 0) if (node->inode.singlypointer == 0)