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

dm: refine 'assert' usage in irq.c and wdt_i6300esb.c

Browse Source 
cleanup 'assert' usage to avoid possible software vulnerabilities

Tracked-On: #3252
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
Reviewed-by: Shuo A Liu <shuo.a.liu@intel.com>
This commit is contained in:
Yonghua Huang 2019-06-17 18:51:08 +08:00 committed by wenlingz
parent e6eef9b672
commit 13228d910f
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
devicemodel/hw/pci/irq.c
View File

@ -26,7 +26,6 @@
*/ */
#include <assert.h>
#include <pthread.h> #include <pthread.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
@ -80,7 +79,9 @@ pirq_valid_irq(int reg)
uint8_t uint8_t
pirq_read(int pin) pirq_read(int pin)
{ {
assert(pin > 0 && pin <= nitems(pirqs)); if (pin <= 0 || pin > nitems(pirqs))
return PIRQ_DIS;
return pirqs[pin - 1].reg; return pirqs[pin - 1].reg;
} }
@ -89,7 +90,9 @@ pirq_write(struct vmctx *ctx, int pin, uint8_t val)
{ {
struct pirq *pirq; struct pirq *pirq;
assert(pin > 0 && pin <= nitems(pirqs)); if (pin <= 0 || pin > nitems(pirqs))
return;
pirq = &pirqs[pin - 1]; pirq = &pirqs[pin - 1];
pthread_mutex_lock(&pirq->lock); pthread_mutex_lock(&pirq->lock);
if (pirq->reg != (val & (PIRQ_DIS | PIRQ_IRQ))) { if (pirq->reg != (val & (PIRQ_DIS | PIRQ_IRQ))) {
@ -103,21 +106,18 @@ pirq_write(struct vmctx *ctx, int pin, uint8_t val)
} }
void void
pci_irq_reserve(int irq) pci_irq_reserve(int irq) {
{ if ((irq >= 0 && irq < nitems(irq_counts)) && pirq_cold
assert(irq >= 0 && irq < nitems(irq_counts)); && (irq_counts[irq] == 0 || irq_counts[irq] == IRQ_DISABLED))
assert(pirq_cold); irq_counts[irq] = IRQ_DISABLED;
assert(irq_counts[irq] == 0 || irq_counts[irq] == IRQ_DISABLED);
irq_counts[irq] = IRQ_DISABLED;
} }
void void
pci_irq_use(int irq) pci_irq_use(int irq)
{ {
assert(irq >= 0 && irq < nitems(irq_counts)); if ((irq >= 0 && irq < nitems(irq_counts)) && pirq_cold
assert(pirq_cold); && (irq_counts[irq] != IRQ_DISABLED))
assert(irq_counts[irq] != IRQ_DISABLED); irq_counts[irq]++;
irq_counts[irq]++;
} }
void void
@ -186,7 +186,9 @@ pirq_alloc_pin(struct pci_vdev *dev)
best_count = irq_counts[irq]; best_count = irq_counts[irq];
} }
} }
assert(best_irq >= 0); if (best_irq < 0)
return -1;
irq_counts[best_irq]++; irq_counts[best_irq]++;
pirqs[best_pin].reg = best_irq; pirqs[best_pin].reg = best_irq;
} }
@ -197,7 +199,9 @@ pirq_alloc_pin(struct pci_vdev *dev)
int int
pirq_irq(int pin) pirq_irq(int pin)
{ {
assert(pin > 0 && pin <= nitems(pirqs)); if (pin <= 0 || pin > nitems(pirqs))
return 0xFF;
return (pirqs[pin - 1].reg & PIRQ_IRQ); return (pirqs[pin - 1].reg & PIRQ_IRQ);
} }

10
devicemodel/hw/pci/wdt_i6300esb.c
View File

@ -13,7 +13,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include "vmmapi.h" #include "vmmapi.h"
@ -252,8 +251,6 @@ static void
pci_wdt_bar_write(struct vmctx *ctx, int vcpu, struct pci_vdev *dev, pci_wdt_bar_write(struct vmctx *ctx, int vcpu, struct pci_vdev *dev,
int baridx, uint64_t offset, int size, uint64_t value) int baridx, uint64_t offset, int size, uint64_t value)
{ {
assert(baridx == 0);
DPRINTF("%s: addr = 0x%x, val = 0x%x, size=%d\n", DPRINTF("%s: addr = 0x%x, val = 0x%x, size=%d\n",
__func__, (int) offset, (int)value, size); __func__, (int) offset, (int)value, size);
@ -269,7 +266,8 @@ pci_wdt_bar_write(struct vmctx *ctx, int vcpu, struct pci_vdev *dev,
} }
} }
} else if (offset == ESB_RELOAD_REG) { } else if (offset == ESB_RELOAD_REG) {
assert(size == 2); if (size != 2)
return;
if (value == ESB_UNLOCK1) if (value == ESB_UNLOCK1)
wdt_state.unlock_state = 1; wdt_state.unlock_state = 1;
@ -306,7 +304,6 @@ pci_wdt_bar_read(struct vmctx *ctx, int vcpu, struct pci_vdev *dev,
{ {
uint64_t ret = 0; uint64_t ret = 0;
assert(baridx == 0);
DPRINTF("%s: addr = 0x%x, size=%d\n\r", __func__, (int) offset, size); DPRINTF("%s: addr = 0x%x, size=%d\n\r", __func__, (int) offset, size);
if (offset == ESB_GIS_REG) { if (offset == ESB_GIS_REG) {
@ -315,7 +312,8 @@ pci_wdt_bar_read(struct vmctx *ctx, int vcpu, struct pci_vdev *dev,
ret |= ESB_WDT_INT_ACT; ret |= ESB_WDT_INT_ACT;
} else if (offset == ESB_RELOAD_REG) { } else if (offset == ESB_RELOAD_REG) {
assert(size == 2); if (size != 2)
return 0;
DPRINTF("%s: timeout: %d\n\r", __func__, wdt_timeout); DPRINTF("%s: timeout: %d\n\r", __func__, wdt_timeout);
if (wdt_timeout != 0) if (wdt_timeout != 0)