Skip to content

Commit

Permalink
linux-user: Assert on bad type in thunk_type_align() and thunk_type_s…
Browse files Browse the repository at this point in the history
…ize()

In thunk_type_align() and thunk_type_size() we currently return
-1 if the value at the type_ptr isn't one of the TYPE_* values
we understand. However, this should never happen, and if it does
then the calling code will go confusingly wrong because none
of the callsites try to handle an error return. Switch to an
assertion instead, so that if this does somehow happen we'll have
a nice clear backtrace of what happened rather than a weird crash
or misbehaviour.

This also silences various Coverity complaints about not handling
the negative return value (CID 1005735, 1005736, 1005738, 1390582).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20180514174616.19601-1-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
  • Loading branch information
pm215 authored and vivier committed May 24, 2018
1 parent 62b9b07 commit 75578d6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/exec/user/thunk.h
Expand Up @@ -135,7 +135,7 @@ static inline int thunk_type_size(const argtype *type_ptr, int is_host)
se = struct_entries + type_ptr[1];
return se->size[is_host];
default:
return -1;
g_assert_not_reached();
}
}

Expand Down Expand Up @@ -185,7 +185,7 @@ static inline int thunk_type_align(const argtype *type_ptr, int is_host)
se = struct_entries + type_ptr[1];
return se->align[is_host];
default:
return -1;
g_assert_not_reached();
}
}

Expand Down

0 comments on commit 75578d6

Please sign in to comment.