stream/ids: make sure we don't slide past last_ack

Bug: #5401.
pull/7787/head
Victor Julien 3 years ago committed by Shivani Bhardwaj
parent 55b2077fcd
commit f04b7a1827

@ -819,21 +819,19 @@ static inline uint64_t GetLeftEdge(Flow *f, TcpSession *ssn, TcpStream *stream)
} }
} }
/* in inline mode keep at least unack'd segments so we can check for overlaps */ uint64_t last_ack_abs = STREAM_BASE_OFFSET(stream);
if (StreamTcpInlineMode() == TRUE) { if (STREAM_LASTACK_GT_BASESEQ(stream)) {
uint64_t last_ack_abs = STREAM_BASE_OFFSET(stream); last_ack_abs += (stream->last_ack - stream->base_seq);
if (STREAM_LASTACK_GT_BASESEQ(stream)) { }
/* get window of data that is acked */ /* in IDS mode we shouldn't see the base_seq pass last_ack */
const uint32_t delta = stream->last_ack - stream->base_seq; DEBUG_VALIDATE_BUG_ON(last_ack_abs < left_edge && StreamTcpInlineMode() == FALSE && !f->ffr &&
/* get max absolute offset */ ssn->state < TCP_CLOSED);
last_ack_abs += delta; left_edge = MIN(left_edge, last_ack_abs);
}
left_edge = MIN(left_edge, last_ack_abs);
/* if we're told to look for overlaps with different data we should /* if we're told to look for overlaps with different data we should
* consider data that is ack'd as well. Injected packets may have * consider data that is ack'd as well. Injected packets may have
* been ack'd or injected packet may be too late. */ * been ack'd or injected packet may be too late. */
} else if (check_overlap_different_data) { if (StreamTcpInlineMode() == FALSE && check_overlap_different_data) {
const uint32_t window = stream->window ? stream->window : 4096; const uint32_t window = stream->window ? stream->window : 4096;
if (window < left_edge) if (window < left_edge)
left_edge -= window; left_edge -= window;

Loading…
Cancel
Save