Changeset 147 for trunk/lib/regfi.c

Timestamp:

02/22/09 14:31:52 (15 years ago)

Author:

tim

Message:

added talloc library

incorporated talloc into winsec and lru_cache modules

introduced talloc into SK caching system

File:

• trunk/lib/regfi.c (modified) (11 diffs)

trunk/lib/regfi.c

@@ -24 +24 @@
  */
 
-#include "../include/regfi.h"
+#include "regfi.h"
 
 
@@ -762 +762 @@
 
 
-/*******************************************************************
- *******************************************************************/
-REGFI_SK_REC* regfi_parse_sk(REGFI_FILE* file, uint32 offset, uint32 max_size, bool strict)
+/******************************************************************************
+ *
+ ******************************************************************************/
+REGFI_SK_REC* regfi_parse_sk(REGFI_FILE* file, uint32 offset, uint32 max_size, 
+                             bool strict)
 {
   REGFI_SK_REC* ret_val;
-  uint8* sec_desc_buf;
+  uint8* sec_desc_buf = NULL;
   uint32 cell_length, length;
-  /*prs_struct ps;*/
   uint8 sk_header[REGFI_SK_MIN_LENGTH];
   bool unalloc = false;
@@ -788 +789 @@
   }
 
-  ret_val = (REGFI_SK_REC*)zalloc(sizeof(REGFI_SK_REC));
+  /*  ret_val = (REGFI_SK_REC*)zalloc(sizeof(REGFI_SK_REC));*/
+  ret_val = talloc(NULL, REGFI_SK_REC);
   if(ret_val == NULL)
     return NULL;
@@ -805 +807 @@
     regfi_add_message(file, REGFI_MSG_WARN, "Invalid cell size found while"
                       " parsing SK record at offset 0x%.8X.", offset);
-    free(ret_val);
-    return NULL;
+    goto fail;
   }
 
@@ -824 +825 @@
                       " are not a multiple of 8 while parsing SK record at"
                       " offset 0x%.8X.", offset);
-    free(ret_val);
-    return NULL;
+    goto fail;
   }
 
@@ -833 +833 @@
                       " cell while parsing SK record at offset 0x%.8X.", 
                       offset);
-    free(ret_val);
-    return NULL;
-  }
-
-  sec_desc_buf = (uint8*)zalloc(ret_val->desc_size);
-  if(ret_val == NULL)
-  {
-    free(ret_val);
-    return NULL;
-  }
+    goto fail;
+  }
+
+  sec_desc_buf = (uint8*)malloc(ret_val->desc_size);
+  if(sec_desc_buf == NULL)
+    goto fail;
 
   length = ret_val->desc_size;
@@ -851 +847 @@
                       " descriptor while parsing SK record at offset 0x%.8X.",
                       offset);
-    free(ret_val);
-    return NULL;
-  }
-
-  if(!(ret_val->sec_desc = winsec_parse_desc(sec_desc_buf, ret_val->desc_size)))
+    goto fail;
+  }
+
+  if(!(ret_val->sec_desc = winsec_parse_desc(ret_val, sec_desc_buf, 
+                                                   ret_val->desc_size)))
   {
     regfi_add_message(file, REGFI_MSG_ERROR, "Failed to parse security"
                       " descriptor while parsing SK record at offset 0x%.8X.",
                       offset);
+    goto fail;
+  }
+
+  free(sec_desc_buf);
+  return ret_val;
+
+ fail:
+  if(sec_desc_buf != NULL)
     free(sec_desc_buf);
-    free(ret_val);
-    return NULL;
-  }
-  free(sec_desc_buf);
-
-
-  return ret_val;
+  talloc_free(ret_val);
+  return NULL;
 }
 
@@ -1147 +1146 @@
   const REGFI_HBIN* hbin;
   uint32 max_length;
-
+  void* failure_ptr = NULL;
+  
   /* First look if we have already parsed it */
   ret_val = (REGFI_SK_REC*)lru_cache_find(file->sk_cache, &offset, 4);
@@ -1165 +1165 @@
     if(ret_val == NULL)
     { /* Cache the parse failure and bail out. */
-      lru_cache_update(file->sk_cache, &offset, 4, (void*)REGFI_OFFSET_NONE);
+      failure_ptr = talloc(NULL, uint32_t);
+      if(failure_ptr == NULL)
+        return NULL;
+      *(uint32_t*)failure_ptr = REGFI_OFFSET_NONE;
+      lru_cache_update(file->sk_cache, &offset, 4, failure_ptr);
       return NULL;
     }
@@ -1287 +1291 @@
 
   /* Cache an unlimited number of SK records.  Typically there are very few. */
-  rb->sk_cache = lru_cache_create(0, cache_secret, true);
+  rb->sk_cache = lru_cache_create_ctx(NULL, 0, cache_secret, true);
 
   /* Default message mask */
@@ -1314 +1318 @@
   range_list_free(file->hbins);
 
+  
   if(file->sk_cache != NULL)
     lru_cache_destroy(file->sk_cache);