Commit 4154c7e0 authored by Li Qiang's avatar Li Qiang Committed by Jason Wang
Browse files

net: e1000e: fix an infinite loop issue 



This issue is like the issue in e1000 network card addressed in
this commit:
e1000: eliminate infinite loops on out-of-bounds transfer start.

Signed-off-by: default avatarLi Qiang <liqiang6-s@360.cn>
Reviewed-by: default avatarDmitry Fleytman <dmitry@daynix.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 81f17e0d

hw/net/e1000e_core.c

+6 −1
Original line number Diff line number Diff line
@@ -806,7 +806,8 @@ typedef struct E1000E_RingInfo_st { 
static inline bool

e1000e_ring_empty(E1000ECore *core, const E1000E_RingInfo *r)

{

    return core->mac[r->dh] == core->mac[r->dt];

    return core->mac[r->dh] == core->mac[r->dt] ||

                core->mac[r->dt] >= core->mac[r->dlen] / E1000_RING_DESC_LEN;

}



static inline uint64_t
@@ -1522,6 +1523,10 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt, 
            desc_size = core->rx_desc_buf_size;

        }



        if (e1000e_ring_empty(core, rxi)) {

            return;

        }



        base = e1000e_ring_head_descr(core, rxi);



        pci_dma_read(d, base, &desc, core->rx_desc_len);