defrag: fix subsequent overlap of start of original (bsd)

Browse Source

Fix the BSD policy case where a subsequent fragment starts before an
original fragment and overlaps the beginning of the original
fragment. In this case the overlapping data from the new fragment is
preferred.

Suricata was preferring the data from the original fragment, but it
should only do that when the original fragment has an offset <= to the
new fragment.

- Adds tests for this case

Bug: #6669
(cherry picked from commit f1709ea551)

pull/10945/head

Jason Ish 3 years ago committed by Victor Julien

parent bf3d420fb7

commit 414f97c669

1 changed files with 610 additions and 286 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

896

src/defrag.c

View File

File diff suppressed because it is too large Load Diff

Write Preview

Loading…

Cancel

Save