From: Victor Julien <victor@inliniac.net>
Date: Thu, 22 Mar 2012 16:02:25 +0000 (+0100)
Subject: Enforce memcap limit before allocating hash table in host and flow engines.
X-Git-Tag: suricata-1.3beta1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4b542d703ee9a78924eb4194ae2f1cc2209e5de;p=thirdparty%2Fsuricata.git

Enforce memcap limit before allocating hash table in host and flow engines.
---

diff --git a/src/flow.c b/src/flow.c
index 2bc884a329..80035b153a 100644
--- a/src/flow.c
+++ b/src/flow.c
@@ -391,6 +391,16 @@ void FlowInitConfig(char quiet)
                flow_config.hash_size, flow_config.prealloc);
 
     /* alloc hash memory */
+    uint64_t hash_size = flow_config.hash_size * sizeof(FlowBucket);
+    if (!(FLOW_CHECK_MEMCAP(hash_size))) {
+        SCLogError(SC_ERR_FLOW_INIT, "allocating flow hash failed: "
+                "max flow memcap is smaller than projected hash size. "
+                "Memcap: %"PRIu64", Hash table size %"PRIu64". Calculate "
+                "total hash size by multiplying \"flow.hash-size\" with %"PRIuMAX", "
+                "which is the hash bucket size.", flow_config.memcap, hash_size,
+                sizeof(FlowBucket));
+        exit(EXIT_FAILURE);
+    }
     flow_hash = SCCalloc(flow_config.hash_size, sizeof(FlowBucket));
     if (flow_hash == NULL) {
         SCLogError(SC_ERR_FATAL, "Fatal error encountered in FlowInitConfig. Exiting...");
diff --git a/src/host.c b/src/host.c
index 5737d5a1fc..f0136ca740 100644
--- a/src/host.c
+++ b/src/host.c
@@ -109,7 +109,7 @@ void HostClearMemory(Host *h) {
 
 #define HOST_DEFAULT_HASHSIZE 4096
 #define HOST_DEFAULT_MEMCAP 16777216
-#define HOST_DEFAULT_PREALLOC 10000
+#define HOST_DEFAULT_PREALLOC 1000
 
 /** \brief initialize the configuration
  *  \warning Not thread safe */
@@ -166,6 +166,16 @@ void HostInitConfig(char quiet)
                host_config.hash_size, host_config.prealloc);
 
     /* alloc hash memory */
+    uint64_t hash_size = host_config.hash_size * sizeof(HostHashRow);
+    if (!(HOST_CHECK_MEMCAP(hash_size))) {
+        SCLogError(SC_ERR_HOST_INIT, "allocating host hash failed: "
+                "max host memcap is smaller than projected hash size. "
+                "Memcap: %"PRIu64", Hash table size %"PRIu64". Calculate "
+                "total hash size by multiplying \"host.hash-size\" with %"PRIuMAX", "
+                "which is the hash bucket size.", host_config.memcap, hash_size,
+                sizeof(HostHashRow));
+        exit(EXIT_FAILURE);
+    }
     host_hash = SCCalloc(host_config.hash_size, sizeof(HostHashRow));
     if (host_hash == NULL) {
         SCLogError(SC_ERR_FATAL, "Fatal error encountered in HostInitConfig. Exiting...");