hw/net/e1000e: advance desc_offset in case of null descriptor
PATCH 1/1 hw/net/e1000e: advance desc_offset in case of null descriptor
From: Prasad J Pandit <[email protected]>
While receiving packets via e1000e_write_packet_to_guest() routine, 'desc_offset' is advanced only when RX descriptor is processed. And RX descriptor is not processed if it has NULL buffer address. This may lead to an infinite loop condition. Increament 'desc_offset' to process next descriptor in the ring to avoid infinite loop.
--- hw/net/e1000e_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
hw/net/e1000e_core.c +4 -4
@@ -1596,13 +1596,13 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt, (const char *) &fcs_pad, e1000x_fcs_len(core->mac)); } } - desc_offset += desc_size; -if (desc_offset >= total_size) { - is_last = true; - } }else {/* as per intel docs; skip descriptors with null buf addr */ trace_e1000e_rx_null_descriptor (); } + desc_offset += desc_size; +if (desc_offset >= total_size) { + is_last = true; + }e1000e_write_rx_descr (core, desc, is_last ? core->rx_pkt :NULL , rss_info, do_ps ? ps_hdr_len :0 , &bastate.written);
Signature · 1 line
2.26.2
Jason Wang
AppliedQuoted 26 lines · P J P
From: Prasad J Pandit <[email protected]>
While receiving packets via
e1000e_write_packet_to_guest()routine, 'desc_offset' is advanced only when RX descriptor is processed. And RX descriptor is not processed if it has NULL buffer address. This may lead to an infinite loop condition. Increament 'desc_offset' to process next descriptor in the ring to avoid infinite loop.Reported-by Cheol-woo Myung <[email protected]>Signed-off-by Prasad J Pandit <[email protected]>--- hw/net/e1000e_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)hw/net/e1000e_core.c +0
-4@@ -1596,13 +1596,13 @@ e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt, (const char *) &fcs_pad, e1000x_fcs_len(core->mac)); } } - desc_offset += desc_size; -if (desc_offset >= total_size) { - is_last = true; - }
hw/net/e1000e_core.c e1000e_write_packet_to_guest(E1000ECore *core, struct NetRxPkt *pkt, · line 1608
Quoted 10 lines
hw/net/e1000e_core.c +4
-0}else {/* as per intel docs; skip descriptors with null buf addr */ trace_e1000e_rx_null_descriptor (); } + desc_offset += desc_size; +if (desc_offset >= total_size) { + is_last = true; + }e1000e_write_rx_descr (core, desc, is_last ? core->rx_pkt :NULL , rss_info, do_ps ? ps_hdr_len :0 , &bastate.written);
Applied.
Thanks