Skip to content

table: validate index bounds in sqfs_table_get #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vasi merged 1 commit into from
Jun 21, 2026
Merged

table: validate index bounds in sqfs_table_get #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ sqfs_err sqfs_table_init(sqfs_table *table, sqfs_fd_t fd, sqfs_off_t start, size
bread = nblocks * sizeof(uint64_t);

table->each = each;
table->count = count;
if (!(table->blocks = malloc(bread)))
goto err;
if (sqfs_pread(fd, table->blocks, bread, start) != bread)
Expand All @@ -67,11 +68,17 @@ void sqfs_table_destroy(sqfs_table *table) {

sqfs_err sqfs_table_get(sqfs_table *table, sqfs *fs, size_t idx, void *buf) {
sqfs_block *block;
size_t pos = idx * table->each;
size_t bnum = pos / SQUASHFS_METADATA_SIZE,
off = pos % SQUASHFS_METADATA_SIZE;

sqfs_off_t bpos = table->blocks[bnum];
size_t pos, bnum, off;
sqfs_off_t bpos;

if (idx >= table->count)
return SQFS_ERR;

pos = idx * table->each;
bnum = pos / SQUASHFS_METADATA_SIZE;
off = pos % SQUASHFS_METADATA_SIZE;

bpos = table->blocks[bnum];
if (sqfs_md_cache(fs, &bpos, &block))
return SQFS_ERR;

Expand Down
1 change: 1 addition & 0 deletions table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

typedef struct {
size_t each;
size_t count;
uint64_t *blocks;
} sqfs_table;

Expand Down
Loading