Skip to content
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.

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

Add stronger checks for offset in seek #1017

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
27 changes: 23 additions & 4 deletions lfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -3661,24 +3661,43 @@ static lfs_ssize_t lfs_file_write_(lfs_t *lfs, lfs_file_t *file,
}
#endif

static bool check_valid_off(lfs_off_t current_pos, lfs_soff_t off) {
/* Check if current_pos + off would be less than 0. We cannot use signed addition
* to check that because it would result in possible UB.
*/
if (off == INT32_MIN) {
return false;
}

if (off < 0 && ((lfs_soff_t) current_pos) < -off) {
return false;
}

/* Unsigned overflow. */
if (off > 0 && (current_pos + ((lfs_off_t) off) < current_pos)) {
return false;
}

return true;
}

static lfs_soff_t lfs_file_seek_(lfs_t *lfs, lfs_file_t *file,
lfs_soff_t off, int whence) {
// find new pos
lfs_off_t npos = file->pos;
if (whence == LFS_SEEK_SET) {
npos = off;
} else if (whence == LFS_SEEK_CUR) {
if ((lfs_soff_t)file->pos + off < 0) {
if (!check_valid_off(file->pos, off)) {
return LFS_ERR_INVAL;
} else {
npos = file->pos + off;
}
} else if (whence == LFS_SEEK_END) {
lfs_soff_t res = lfs_file_size_(lfs, file) + off;
if (res < 0) {
if (!check_valid_off(lfs_file_size_(lfs, file), off)) {
return LFS_ERR_INVAL;
} else {
npos = res;
npos = lfs_file_size_(lfs, file) + off;
}
}

Expand Down
Loading