From: Victor Julien <victor@inliniac.net>
Date: Mon, 8 Jun 2020 13:24:00 +0000 (+0200)
Subject: stream: fix IDS mode using un-ACK'd data
X-Git-Tag: suricata-6.0.0-beta1~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7d59a61eab713fe9ba3652b3e61d12741a66882;p=thirdparty%2Fsuricata.git

stream: fix IDS mode using un-ACK'd data
---

diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index 549c8c88a7..759be814b6 100644
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -1008,7 +1008,7 @@ static inline uint32_t AdjustToAcked(const Packet *p, const TcpStream *stream,
         if (p->flags & PKT_PSEUDO_STREAM_END) {
             // fall through, we use all available data
         } else {
-            uint64_t last_ack_abs = app_progress; /* absolute right edge of ack'd data */
+            uint64_t last_ack_abs = STREAM_BASE_OFFSET(stream);
             if (STREAM_LASTACK_GT_BASESEQ(stream)) {
                 /* get window of data that is acked */
                 uint32_t delta = stream->last_ack - stream->base_seq;