mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtl8139: validate rx ring before receiving packets

Browse Source 
Commit ff71f2e8ca prevent the possible
crash during initialization of linux driver by checking the operating
mode.This seems too strict as:

- the real card could still work in mode other than normal
- some buggy driver who does not set correct opmode after eeprom
 access

So, considering rx ring address were reset to zero (which could be
safely trated as an address not intened to DMA to), in order to
both letting old guest work and preventing the unexpected DMA to
guest, we can forbid packet receiving when rx ring address is zero.

Tested-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jason Wang 2012-05-17 13:25:43 +08:00 committed by Anthony Liguori
parent 2624bab836
commit fcce6fd25f
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/rtl8139.c
View File

@ -781,6 +781,13 @@ static inline dma_addr_t rtl8139_addr64(uint32_t low, uint32_t high)
#endif #endif
} }
/* Workaround for buggy guest driver such as linux who allocates rx
* rings after the receiver were enabled. */
static bool rtl8139_cp_rx_valid(RTL8139State *s)
{
return !(s->RxRingAddrLO == 0 && s->RxRingAddrHI == 0);
}
static int rtl8139_can_receive(VLANClientState *nc) static int rtl8139_can_receive(VLANClientState *nc)
{ {
RTL8139State *s = DO_UPCAST(NICState, nc, nc)->opaque; RTL8139State *s = DO_UPCAST(NICState, nc, nc)->opaque;
@ -791,11 +798,8 @@ static int rtl8139_can_receive(VLANClientState *nc)
return 1; return 1;
if (!rtl8139_receiver_enabled(s)) if (!rtl8139_receiver_enabled(s))
return 1; return 1;
/* network/host communication happens only in normal mode */
if ((s->Cfg9346 & Chip9346_op_mask) != Cfg9346_Normal)
return 0;
if (rtl8139_cp_receiver_enabled(s)) { if (rtl8139_cp_receiver_enabled(s) && rtl8139_cp_rx_valid(s)) {
/* ??? Flow control not implemented in c+ mode. /* ??? Flow control not implemented in c+ mode.
This is a hack to work around slirp deficiencies anyway. */ This is a hack to work around slirp deficiencies anyway. */
return 1; return 1;
@ -836,12 +840,6 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
return -1; return -1;
} }
/* check whether we are in normal mode */
if ((s->Cfg9346 & Chip9346_op_mask) != Cfg9346_Normal) {
DPRINTF("not in normal op mode\n");
return -1;
}
/* XXX: check this */ /* XXX: check this */
if (s->RxConfig & AcceptAllPhys) { if (s->RxConfig & AcceptAllPhys) {
/* promiscuous: receive all */ /* promiscuous: receive all */
@ -946,6 +944,10 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
if (rtl8139_cp_receiver_enabled(s)) if (rtl8139_cp_receiver_enabled(s))
{ {
if (!rtl8139_cp_rx_valid(s)) {
return size;
}
DPRINTF("in C+ Rx mode ================\n"); DPRINTF("in C+ Rx mode ================\n");
/* begin C+ receiver mode */ /* begin C+ receiver mode */