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

VPP-650: handle buffer failure in vlib_buffer_copy(...)

Browse Source 
Change-Id: I6aac48d780fcd935818221044eae50067f225175
Signed-off-by: Dave Barach <dave@barachs.net>
This commit is contained in:
Dave Barach
2017-02-23 17:11:26 -05:00
committed by Dave Barach
parent 02767e9f2e
commit 26cd8c1295
4 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vlib/buffer_funcs.h
View File

@ -489,7 +489,15 @@ vlib_buffer_copy (vlib_main_t * vm, vlib_buffer_t * b)
vec_validate (new_buffers, n_buffers - 1);
n_alloc = vlib_buffer_alloc (vm, new_buffers, n_buffers);
ASSERT (n_alloc == n_buffers);
/* No guarantee that we'll get all the buffers we asked for */
if (PREDICT_FALSE (n_alloc < n_buffers))
{
if (n_alloc > 0)
vlib_buffer_free (vm, new_buffers, n_alloc);
vec_free (new_buffers);
return 0;
}
/* 1st segment */
s = b;
@ -518,6 +526,7 @@ vlib_buffer_copy (vlib_main_t * vm, vlib_buffer_t * b)
d->flags = s->flags & flag_mask;
}
vec_free (new_buffers);
return fd;
}