diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2019-06-04 21:14:26 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-06-20 03:36:54 +0000 |
| commit | c09b7fd05104745a535a26794c0e680d7a6781c5 (patch) | |
| tree | f7034c68433e2699d8b82e4257df1f9c235e4935 /src/vlib/buffer_funcs.h | |
| parent | d314963d0f1d12c45c55c7fd210f93c5cac3a8fc (diff) | |
buffers: fix crash
this change is being made to fix a crash when current_data < 0 in buffer
linearization function
Ticket: N/A
Type: fix
Fixes: f883f6a1132ad4bb7aa9d9a79d420274fbcf3b64
Change-Id: Ia4ede823f673780e0c30d075b091db42e183650d
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src/vlib/buffer_funcs.h')
| -rw-r--r-- | src/vlib/buffer_funcs.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/vlib/buffer_funcs.h b/src/vlib/buffer_funcs.h index 521a036812c..8091d83729c 100644 --- a/src/vlib/buffer_funcs.h +++ b/src/vlib/buffer_funcs.h @@ -1416,13 +1416,19 @@ vlib_buffer_chain_linearize (vlib_main_t * vm, vlib_buffer_t * b) if (dst_left == 0) { - if (db != first) - db->current_data = 0; db->current_length = dp - (u8 *) vlib_buffer_get_current (db); ASSERT (db->flags & VLIB_BUFFER_NEXT_PRESENT); db = vlib_get_buffer (vm, db->next_buffer); dst_left = data_size; - dp = db->data; + if (db->current_data > 0) + { + db->current_data = 0; + } + else + { + dst_left += -db->current_data; + } + dp = vlib_buffer_get_current (db); } while (src_left == 0) |