From: Victor Julien <vjulien@oisf.net>
Date: Wed, 1 Feb 2023 16:11:39 +0000 (+0100)
Subject: streaming: grow more conservatively
X-Git-Tag: suricata-7.0.0-rc2~598
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5409a0b29c2b04c18cb711db88767b346eb8595;p=thirdparty%2Fsuricata.git

streaming: grow more conservatively

Don't grow to next multiple of cfg->buf_size if size is already
a multiple of buf_size.
---

diff --git a/src/util-streaming-buffer.c b/src/util-streaming-buffer.c
index aeab259a0a..6855f7387e 100644
--- a/src/util-streaming-buffer.c
+++ b/src/util-streaming-buffer.c
@@ -564,6 +564,18 @@ static void SBBPrune(StreamingBuffer *sb, const StreamingBufferConfig *cfg)
 #endif
 }
 
+static inline uint32_t ToNextMultipleOf(const uint32_t in, const uint32_t m)
+{
+    uint32_t r = in;
+    if (m > 0) {
+        const uint32_t x = in % m;
+        if (x != 0) {
+            r = (in - x) + m;
+        }
+    }
+    return r;
+}
+
 static thread_local bool g2s_warn_once = false;
 
 static inline int WARN_UNUSED GrowRegionToSize(StreamingBuffer *sb,
@@ -581,9 +593,8 @@ static inline int WARN_UNUSED GrowRegionToSize(StreamingBuffer *sb,
     }
 
     /* try to grow in multiples of cfg->buf_size */
-    uint32_t x = cfg->buf_size ? size % cfg->buf_size : 0;
-    uint32_t base = size - x;
-    uint32_t grow = base + cfg->buf_size;
+    const uint32_t grow = ToNextMultipleOf(size, cfg->buf_size);
+    SCLogDebug("grow %u", grow);
 
     void *ptr = REALLOC(cfg, region->buf, region->buf_size, grow);
     if (ptr == NULL) {