From b595da6c51eee8ba857166e7cc8862365d4a72e9 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Tue, 11 Jun 2019 12:57:19 +0200
Subject: [PATCH] ftp: fix reply without request

Permit picking up any reply w/o a request. Observed unsolicited server
messages before connection termination.

Previously the code assumed that this could only happen on connection
start when there was no previously recorded command.
---
 src/app-layer-ftp.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/app-layer-ftp.c b/src/app-layer-ftp.c
index 26c0f99300..b8c62b866b 100644
--- a/src/app-layer-ftp.c
+++ b/src/app-layer-ftp.c
@@ -752,24 +752,21 @@ static int FTPParseResponse(Flow *f, void *ftp_state, AppLayerParserState *pstat
 {
     FtpState *state = (FtpState *)ftp_state;
     int retcode = 1;
-    FTPTransaction *tx;
 
-    if (state->command == FTP_COMMAND_UNKNOWN) {
-        if (unlikely(input_len == 0)) {
-            return 1;
-        }
+    if (unlikely(input_len == 0)) {
+        return 1;
+    }
 
-        tx = FTPGetOldestTx(state);
-        if (tx == NULL) {
-            tx = FTPTransactionCreate(state);
-        }
-        if (unlikely(tx == NULL)) {
-            return -1;
-        }
+    FTPTransaction *tx = FTPGetOldestTx(state);
+    if (tx == NULL) {
+        tx = FTPTransactionCreate(state);
+    }
+    if (unlikely(tx == NULL)) {
+        return -1;
+    }
+    if (state->command == FTP_COMMAND_UNKNOWN || tx->command_descriptor == NULL) {
         /* unknown */
         tx->command_descriptor = &FtpCommands[FTP_COMMAND_MAX -1];
-    } else {
-        tx = FTPGetOldestTx(state);
     }
 
     state->curr_tx = tx;