From: Jason Ish <jason.ish@oisf.net>
Date: Thu, 23 Jan 2020 17:31:06 +0000 (-0600)
Subject: defrag: set livedev on the reassembled packet (issue-3380)
X-Git-Tag: suricata-5.0.2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a6d4baf04ca67e432e3d3d5c0b739fb9a1e4eec;p=thirdparty%2Fsuricata.git

defrag: set livedev on the reassembled packet (issue-3380)

Set the livedev on reassembled packets to that of the parent
packet. Fixes issues with multidetect, specifically a segfault
as reported in issue 3380.

Bug #3380.

(cherry picked from commit d1eab5aa462f18f66ada9e5bbc9c89b8104db96a)
---

diff --git a/src/decode.c b/src/decode.c
index a9f32fda44..9d8aace0a7 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -376,6 +376,7 @@ Packet *PacketDefragPktSetup(Packet *parent, const uint8_t *pkt, uint32_t len, u
     p->vlan_id[0] = parent->vlan_id[0];
     p->vlan_id[1] = parent->vlan_id[1];
     p->vlan_idx = parent->vlan_idx;
+    p->livedev = parent->livedev;
 
     SCReturnPtr(p, "Packet");
 }