From a27ee49c73a23a8477270207faa7b2861f7f3207 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Tue, 21 Dec 2021 09:59:15 +0100 Subject: [PATCH] app-layer: move app_progress forward on errors as well In case of APP_LAYER_ERROR still move the app_progress forward. This helps validation of frame offsets and should be harmless otherwise. --- src/app-layer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app-layer.c b/src/app-layer.c index dbe390e2df..073a693fb2 100644 --- a/src/app-layer.c +++ b/src/app-layer.c @@ -460,10 +460,11 @@ static int TCPProtoDetect(ThreadVars *tv, int r = AppLayerParserParse(tv, app_tctx->alp_tctx, f, f->alproto, flags, data, data_len); PACKET_PROFILING_APP_END(app_tctx, f->alproto); + if (r != 1) { + StreamTcpUpdateAppLayerProgress(ssn, direction, data_len); + } if (r < 0) { SCReturnInt(-1); - } else if (r == 0) { - StreamTcpUpdateAppLayerProgress(ssn, direction, data_len); } } else { /* if the ssn is midstream, we may end up with a case where the @@ -533,7 +534,7 @@ static int TCPProtoDetect(ThreadVars *tv, f->alproto, flags, data, data_len); PACKET_PROFILING_APP_END(app_tctx, f->alproto); - if (r == 0) { + if (r != 1) { StreamTcpUpdateAppLayerProgress(ssn, direction, data_len); } @@ -710,7 +711,7 @@ int AppLayerHandleTCPData(ThreadVars *tv, TcpReassemblyThreadCtx *ra_ctx, r = AppLayerParserParse(tv, app_tctx->alp_tctx, f, f->alproto, flags, data, data_len); PACKET_PROFILING_APP_END(app_tctx, f->alproto); - if (r == 0) { + if (r != 1) { StreamTcpUpdateAppLayerProgress(ssn, direction, data_len); } } -- 2.47.2