From: Philippe Antoine <contact@catenacyber.fr>
Date: Fri, 29 Apr 2022 09:58:10 +0000 (+0200)
Subject: defrag: use util function for timeout
X-Git-Tag: suricata-7.0.0-beta1~396
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e87c53bb55c5adb3e8ee319a85bcf1b42143e269;p=thirdparty%2Fsuricata.git

defrag: use util function for timeout

To fix timestamp overflow as found by oss-fuzz
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=44608

fixu
---

diff --git a/src/defrag.c b/src/defrag.c
index 992d0205c2..a096ea58d8 100644
--- a/src/defrag.c
+++ b/src/defrag.c
@@ -628,8 +628,7 @@ DefragInsertFrag(ThreadVars *tv, DecodeThreadVars *dtv, DefragTracker *tracker,
     }
 
     /* Update timeout. */
-    tracker->timeout.tv_sec = p->ts.tv_sec + tracker->host_timeout;
-    tracker->timeout.tv_usec = p->ts.tv_usec;
+    tracker->timeout = TimevalWithSeconds(&p->ts, tracker->host_timeout);
 
     Frag *prev = NULL, *next = NULL;
     bool overlap = false;