diff options
| author |   Steven <sluong@cisco.com> | 2018-10-03 15:25:13 -0700 |
|---|---|---|
| committer | Steven <sluong@cisco.com> | 2018-10-03 22:33:29 -0700 |
| commit | 744da656d3442bb812f50d6e8746f0f11adee8b3 (patch) | |
| tree | c14a58b523ccb6b503a6547b25c76b7cccd167e5 /src/plugins/vmxnet3/output.c | |
| parent | 5958769b2c9463f2c8da85a380da1ec439354a10 (diff) | |
vmxnet3: coverity woe
Coverity complains that hb might be null when !prev_b0 is true. It may be right, but not likely.
To make the code more explicit when it parses a complete packet, set got_packet = 1 and test
got_packet instead of prev_b0 which is somewhat obscure.
Use vlib_buffer_free_one rather than vlib_buffer_free_no_next in output.c which takes care of
chain buffers.
Change-Id: I6e0587605fdc622c3f55fedd74c474666631ed91
Signed-off-by: Steven <sluong@cisco.com>
Diffstat (limited to 'src/plugins/vmxnet3/output.c')
| -rw-r--r-- | src/plugins/vmxnet3/output.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/vmxnet3/output.c b/src/plugins/vmxnet3/output.c index d6b7aaa0a15..bcb02949184 100644 --- a/src/plugins/vmxnet3/output.c +++ b/src/plugins/vmxnet3/output.c @@ -59,25 +59,22 @@ vmxnet3_txq_release (vlib_main_t * vm, vmxnet3_device_t * vd, vmxnet3_txq_t * txq) { vmxnet3_tx_comp *tx_comp; - u32 bi0; vmxnet3_tx_comp_ring *comp_ring; - u16 eop_idx, desc_idx; comp_ring = &txq->tx_comp_ring; tx_comp = &txq->tx_comp[comp_ring->next]; while ((tx_comp->flags & VMXNET3_TXCF_GEN) == comp_ring->gen) { - eop_idx = tx_comp->index & VMXNET3_TXC_INDEX; - do + u16 eop_idx = tx_comp->index & VMXNET3_TXC_INDEX; + u32 bi0 = txq->tx_ring.bufs[txq->tx_ring.consume]; + + vlib_buffer_free_one (vm, bi0); + while (txq->tx_ring.consume != eop_idx) { - desc_idx = txq->tx_ring.consume; - bi0 = txq->tx_ring.bufs[desc_idx]; - txq->tx_ring.bufs[desc_idx] = ~0; - vlib_buffer_free_no_next (vm, &bi0, 1); vmxnet3_tx_ring_advance_consume (txq); } - while (desc_idx != eop_idx); + vmxnet3_tx_ring_advance_consume (txq); vmxnet3_tx_comp_ring_advance_next (txq); tx_comp = &txq->tx_comp[comp_ring->next]; |