github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-21 21:19:35 +00:00
Code Issues Projects Releases Wiki Activity

HV: instr_emul: Replace ASSERT/panic with pr_err

Browse Source 
ASSERT/panic are called when we get invalid values. It is a little bit strict.
This patch replaces ASSERT/panic with pr_err and return -EINVAL.

v1 -> v2:
  - v1 patch name (HV: instr_emul: Remove unnecessary check in decode_xxx)
  - keep the check and replace ASSERT/panic with pr_err.

Signed-off-by: Kaige Fu <kaige.fu@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Kaige Fu 2018-07-17 09:14:43 +08:00 committed by lijinxia
parent f912953539
commit 7e9b7f613b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hypervisor/arch/x86/guest/instr_emul.c
View File

@ -2046,7 +2046,9 @@ decode_displacement(struct vie *vie)
}
if (n != 1 && n != 4) {
panic("decode_displacement: invalid disp_bytes %d", n);
pr_err("%s: decode_displacement: invalid disp_bytes %d",
__func__, n);
return -EINVAL;
}
for (i = 0; i < n; i++) {
@ -2103,8 +2105,11 @@ decode_immediate(struct vie *vie)
return 0;
}
ASSERT(n == 1 || n == 2 || n == 4,
"%s: invalid number of immediate bytes: %d", __func__, n);
if ( n != 1 && n != 2 && n != 4) {
pr_err("%s: invalid number of immediate bytes: %d",
__func__, n);
return -EINVAL;
}
for (i = 0; i < n; i++) {
if (vie_peek(vie, &x) != 0) {
@ -2145,7 +2150,10 @@ decode_moffset(struct vie *vie)
* The memory offset size follows the address-size of the instruction.
*/
n = vie->addrsize;
ASSERT(n == 2U || n == 4U || n == 8U, "invalid moffset bytes: %hhu", n);
if ( n != 2U && n != 4U && n != 8U) {
pr_err("%s: invalid moffset bytes: %hhu", __func__, n);
return -EINVAL;
}
u.u64 = 0UL;
for (i = 0U; i < n; i++) {