]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
defrag: use util function for timeout
authorPhilippe Antoine <contact@catenacyber.fr>
Fri, 29 Apr 2022 09:58:10 +0000 (11:58 +0200)
committerVictor Julien <vjulien@oisf.net>
Fri, 1 Jul 2022 13:45:31 +0000 (15:45 +0200)
To fix timestamp overflow as found by oss-fuzz
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=44608

fixu

src/defrag.c

index 992d0205c262f24d6e9dd19db0ffa529cbaf2877..a096ea58d8812b9920c9994617a2f8906df395f5 100644 (file)
@@ -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;