ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc: fix error handling in punt_replicate

Browse Source 
If vlib_buffer_clone (...) fails due to a buffer allocation error, update
*n_dispatched with the actual number of clones, not the requested
number of clones.

Punt_replicate(...) should not set *to_next[0] = bi0. The original
buffer is enqueued separately in punt_dispatch_node(...)

Type: fix

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I774ad8f8c1a0633de4cf8ae5530629201c229347
This commit is contained in:
Dave Barach
2020-04-08 14:31:45 -04:00
committed by Neale Ranns
parent e759bb543c
commit 1adc7e78ad
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vlib/punt_node.c
View File

@ -120,11 +120,16 @@ punt_replicate (vlib_main_t * vm,
* so there's no need to check if the to_next frame * so there's no need to check if the to_next frame
* is full */ * is full */
} }
*n_dispatched = *n_dispatched + n_clones0; *n_dispatched = *n_dispatched + n_cloned0;
/* The original buffer is the first clone */ /* The original buffer is the first clone */
next0 = punt_dp_db[pr0][0]; next0 = punt_dp_db[pr0][0];
*to_next[0] = bi0; /*
* Note: the original buffer is enqueued in punt_dispatch_node.
* Don't do it here.
*
* *to_next[0] = bi0;
*/
return next0; return next0;
} }

1
src/vnet/ip/punt_node.c
View File

@ -596,6 +596,7 @@ punt_socket_rx_fd (vlib_main_t * vm, vlib_node_runtime_t * node, u32 fd)
return 1; return 1;
error: error:
vlib_put_next_frame (vm, node, next, n_left_to_next);
vlib_node_increment_counter (vm, punt_socket_rx_node.index, error, 1); vlib_node_increment_counter (vm, punt_socket_rx_node.index, error, 1);
return 0; return 0;
} }