GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/romcc: Add extra NULL checks for member 

In each of these cases it is possible that 'member' is NULL at the
beginning, which will skip the earlier while loops entirely and cause
a NULL dereference later on. Add extra error checks to prevent this.

Change-Id: Ib5873c0830b71397ef661976d387fc6ce33c5cd1
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Found-by: Coverity CID 1129147, 1129152, 1129153, 1129154
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32916
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Jacob Garber 2019-05-21 13:41:50 -06:00 committed by Patrick Georgi
parent 55fffa29c2
commit b4222a65ad
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/romcc/romcc.c
View File

@ -6228,6 +6228,8 @@ static size_t field_offset(struct compile_state *state,
size += size_of(state, member->left); size += size_of(state, member->left);
member = member->right; member = member->right;
} }
if (member == NULL)
internal_error(state, 0, "Member is NULL");
size += needed_padding(state, member, size); size += needed_padding(state, member, size);
} }
else if ((type->type & TYPE_MASK) == TYPE_UNION) { else if ((type->type & TYPE_MASK) == TYPE_UNION) {
@ -6350,10 +6352,12 @@ static size_t index_offset(struct compile_state *state,
i++; i++;
member = member->right; member = member->right;
} }
size += needed_padding(state, member, size); if (member == NULL)
internal_error(state, 0, "Member is NULL");
if (i != index) { if (i != index) {
internal_error(state, 0, "Missing member index: %u", index); internal_error(state, 0, "Missing member index: %u", index);
} }
size += needed_padding(state, member, size);
} }
else if ((type->type & TYPE_MASK) == TYPE_JOIN) { else if ((type->type & TYPE_MASK) == TYPE_JOIN) {
ulong_t i; ulong_t i;
@ -6402,6 +6406,8 @@ static size_t index_reg_offset(struct compile_state *state,
i++; i++;
member = member->right; member = member->right;
} }
if (member == NULL)
internal_error(state, 0, "Member is NULL");
if (i != index) { if (i != index) {
internal_error(state, 0, "Missing member index: %u", index); internal_error(state, 0, "Missing member index: %u", index);
} }
@ -6640,6 +6646,8 @@ static struct type *reg_type(
offset += size; offset += size;
member = member->right; member = member->right;
} }
if (member == NULL)
internal_error(state, 0, "Member is NULL");
offset += reg_needed_padding(state, member, offset); offset += reg_needed_padding(state, member, offset);
member = reg_type(state, member, reg_offset - offset); member = reg_type(state, member, reg_offset - offset);
break; break;