leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs/squashfs: Fix Coverity Scan defects

Browse Source 
Fix control flow issues and null pointer dereferences.

Signed-off-by: Joao Marcos Costa <jmcosta944@gmail.com>
This commit is contained in:
Joao Marcos Costa 2020-09-11 12:21:06 +02:00 committed by Tom Rini
parent 98f3ee09d0
commit a7dc37d38c
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/squashfs/sqfs.c
View File

@ -154,7 +154,7 @@ static int sqfs_frag_lookup(u32 inode_fragment_index,
header = get_unaligned_le16(metadata_buffer + table_offset); header = get_unaligned_le16(metadata_buffer + table_offset);
metadata = metadata_buffer + table_offset + SQFS_HEADER_SIZE; metadata = metadata_buffer + table_offset + SQFS_HEADER_SIZE;
if (!metadata) { if (!metadata || !header) {
ret = -ENOMEM; ret = -ENOMEM;
goto free_buffer; goto free_buffer;
} }
@ -434,9 +434,9 @@ static int sqfs_search_dir(struct squashfs_dir_stream *dirs, char **token_list,
{ {
struct squashfs_super_block *sblk = ctxt.sblk; struct squashfs_super_block *sblk = ctxt.sblk;
char *path, *target, **sym_tokens, *res, *rem; char *path, *target, **sym_tokens, *res, *rem;
struct squashfs_ldir_inode *ldir = NULL;
int j, ret, new_inode_number, offset; int j, ret, new_inode_number, offset;
struct squashfs_symlink_inode *sym; struct squashfs_symlink_inode *sym;
struct squashfs_ldir_inode *ldir;
struct squashfs_dir_inode *dir; struct squashfs_dir_inode *dir;
struct fs_dir_stream *dirsp; struct fs_dir_stream *dirsp;
struct fs_dirent *dent; struct fs_dirent *dent;
@ -448,8 +448,8 @@ static int sqfs_search_dir(struct squashfs_dir_stream *dirs, char **token_list,
table = sqfs_find_inode(dirs->inode_table, le32_to_cpu(sblk->inodes), table = sqfs_find_inode(dirs->inode_table, le32_to_cpu(sblk->inodes),
sblk->inodes, sblk->block_size); sblk->inodes, sblk->block_size);
/* root is a regular directory, not an extended one */
dir = (struct squashfs_dir_inode *)table; dir = (struct squashfs_dir_inode *)table;
ldir = (struct squashfs_ldir_inode *)table;
/* get directory offset in directory table */ /* get directory offset in directory table */
offset = sqfs_dir_offset(table, m_list, m_count); offset = sqfs_dir_offset(table, m_list, m_count);
@ -1146,7 +1146,10 @@ static int sqfs_get_regfile_info(struct squashfs_reg_inode *reg,
finfo->start = get_unaligned_le32(&reg->start_block); finfo->start = get_unaligned_le32(&reg->start_block);
finfo->frag = SQFS_IS_FRAGMENTED(get_unaligned_le32(&reg->fragment)); finfo->frag = SQFS_IS_FRAGMENTED(get_unaligned_le32(&reg->fragment));
if (finfo->size < 1 || finfo->offset < 0 || finfo->start < 0) if (finfo->frag && finfo->offset == 0xFFFFFFFF)
return -EINVAL;
if (finfo->size < 1 || finfo->start == 0xFFFFFFFF)
return -EINVAL; return -EINVAL;
if (finfo->frag) { if (finfo->frag) {
@ -1156,7 +1159,7 @@ static int sqfs_get_regfile_info(struct squashfs_reg_inode *reg,
if (ret < 0) if (ret < 0)
return -EINVAL; return -EINVAL;
finfo->comp = true; finfo->comp = true;
if (fentry->size < 1 || fentry->start < 0) if (fentry->size < 1 || fentry->start == 0x7FFFFFFF)
return -EINVAL; return -EINVAL;
} else { } else {
datablk_count = DIV_ROUND_UP(finfo->size, le32_to_cpu(blksz)); datablk_count = DIV_ROUND_UP(finfo->size, le32_to_cpu(blksz));
@ -1181,7 +1184,10 @@ static int sqfs_get_lregfile_info(struct squashfs_lreg_inode *lreg,
finfo->start = get_unaligned_le64(&lreg->start_block); finfo->start = get_unaligned_le64(&lreg->start_block);
finfo->frag = SQFS_IS_FRAGMENTED(get_unaligned_le32(&lreg->fragment)); finfo->frag = SQFS_IS_FRAGMENTED(get_unaligned_le32(&lreg->fragment));
if (finfo->size < 1 || finfo->offset < 0 || finfo->start < 0) if (finfo->frag && finfo->offset == 0xFFFFFFFF)
return -EINVAL;
if (finfo->size < 1 || finfo->start == 0x7FFFFFFF)
return -EINVAL; return -EINVAL;
if (finfo->frag) { if (finfo->frag) {
@ -1191,7 +1197,7 @@ static int sqfs_get_lregfile_info(struct squashfs_lreg_inode *lreg,
if (ret < 0) if (ret < 0)
return -EINVAL; return -EINVAL;
finfo->comp = true; finfo->comp = true;
if (fentry->size < 1 || fentry->start < 0) if (fentry->size < 1 || fentry->start == 0x7FFFFFFF)
return -EINVAL; return -EINVAL;
} else { } else {
datablk_count = DIV_ROUND_UP(finfo->size, le32_to_cpu(blksz)); datablk_count = DIV_ROUND_UP(finfo->size, le32_to_cpu(blksz));

3
fs/squashfs/sqfs_dir.c
View File

@ -34,8 +34,7 @@ int sqfs_dir_offset(void *dir_i, u32 *m_list, int m_count)
struct squashfs_ldir_inode *ldir; struct squashfs_ldir_inode *ldir;
struct squashfs_dir_inode *dir; struct squashfs_dir_inode *dir;
u32 start_block; u32 start_block;
u16 offset; int j, offset;
int j;
switch (get_unaligned_le16(&base->inode_type)) { switch (get_unaligned_le16(&base->inode_type)) {
case SQFS_DIR_TYPE: case SQFS_DIR_TYPE:

5
fs/squashfs/sqfs_inode.c
View File

@ -142,8 +142,11 @@ int sqfs_read_metablock(unsigned char *file_mapping, int offset,
u16 header; u16 header;
data = file_mapping + offset; data = file_mapping + offset;
if (!data)
return -EFAULT;
header = get_unaligned((u16 *)data); header = get_unaligned((u16 *)data);
if (!header || !data) if (!header)
return -EINVAL; return -EINVAL;
*compressed = SQFS_COMPRESSED_METADATA(header); *compressed = SQFS_COMPRESSED_METADATA(header);