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/input.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/input.c')
| -rw-r--r-- | src/plugins/vmxnet3/input.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/vmxnet3/input.c b/src/plugins/vmxnet3/input.c index cdd3c7bf0df..4ff459a066a 100644 --- a/src/plugins/vmxnet3/input.c +++ b/src/plugins/vmxnet3/input.c @@ -90,7 +90,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, u16 rid; vlib_buffer_t *prev_b0 = 0, *hb = 0; u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT; - u8 known_next = 0; + u8 known_next = 0, got_packet = 0; vmxnet3_rx_desc *rxd; clib_error_t *error; @@ -173,6 +173,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, * Both start and end of packet is set. It is a complete packet */ prev_b0 = 0; + got_packet = 1; } } else if (rx_comp->index & VMXNET3_RXCI_EOP) @@ -184,7 +185,8 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, prev_b0->next_buffer = bi0; hb->total_length_not_including_first_buffer += b0->current_length; - prev_b0 = 0; // Get next packet + prev_b0 = 0; + got_packet = 1; } else { @@ -216,7 +218,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, n_rx_bytes += b0->current_length; - if (!prev_b0) + if (got_packet) { ethernet_header_t *e = (ethernet_header_t *) hb->data; @@ -271,6 +273,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, next++; bi++; hb = 0; + got_packet = 0; } } |