Skip to content

romfs: fix a use-before-set bug on checking the dirent #370

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
merged 1 commit into from
Nov 3, 2014
Merged

romfs: fix a use-before-set bug on checking the dirent #370

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
6 changes: 3 additions & 3 deletions components/dfs/filesystems/romfs/dfs_romfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ int dfs_romfs_ioctl(struct dfs_fd *file, int cmd, void *args)

rt_inline int check_dirent(struct romfs_dirent *dirent)
{
if (!(dirent->type == ROMFS_DIRENT_FILE || dirent->type == ROMFS_DIRENT_DIR) ||
(dirent->size == 0 || dirent->size == ~0))
if ((dirent->type != ROMFS_DIRENT_FILE && dirent->type != ROMFS_DIRENT_DIR)
|| dirent->size == ~0)
return -1;
return 0;
}
Expand Down Expand Up @@ -191,7 +191,7 @@ int dfs_romfs_open(struct dfs_fd *file)

root_dirent = (struct romfs_dirent *)file->fs->data;

if (check_dirent(dirent) != 0)
if (check_dirent(root_dirent) != 0)
return -DFS_STATUS_EIO;

if (file->flags & (DFS_O_CREAT | DFS_O_WRONLY | DFS_O_APPEND | DFS_O_TRUNC | DFS_O_RDWR))
Expand Down