X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/47d5f7c2e72bdc2cc06414e1c07b27760974e2ca..298182ad446aaced14dea7ed0e7c968946787288:/lmem.c

diff --git a/lmem.c b/lmem.c
index a56108a..5c36e98 100644
--- a/lmem.c
+++ b/lmem.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: lmem.c,v 1.2 2000/06/17 11:29:20 mdw Exp $
+ * $Id$
  *
  * Locked memory allocation (Unix-specific)
  *
@@ -27,17 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: lmem.c,v $
- * Revision 1.2  2000/06/17 11:29:20  mdw
- * Add arena support.
- *
- * Revision 1.1  1999/12/22 16:02:52  mdw
- * Interface to allocating `locked' memory (which isn't paged out).
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -67,7 +56,7 @@ static void *aalloc(arena *a, size_t sz) { return l_alloc((lmem *)a, sz); }
 static void afree(arena *a, void *p) { l_free((lmem *)a, p); }
 static void apurge(arena *a) { l_purge((lmem *)a); }
 
-static arena_ops l_ops = { aalloc, arena_fakerealloc, afree, apurge };
+static const arena_ops l_ops = { aalloc, arena_fakerealloc, afree, apurge };
 
 /*----- Main code ---------------------------------------------------------*/
 
@@ -97,6 +86,7 @@ int l_init(lmem *lm, size_t sz)
 
   lm->a.ops = &l_ops;
   lm->err = 0;
+  lm->f = 0;
 
   /* --- Try making a secure locked passphrase buffer --- *
    *
@@ -133,7 +123,8 @@ int l_init(lmem *lm, size_t sz)
     lm->err = errno;
     munmap(p, sz);
     p = 0;
-  }
+  } else
+    lm->f |= LF_LOCKED;
 
 #endif
 
@@ -142,8 +133,8 @@ int l_init(lmem *lm, size_t sz)
 #ifdef HAVE_MLOCK
   if (!p)
 #else
-  ll->err = 0;
-  ll->emsg = "locked memory not available on this system";
+  lm->err = 0;
+  lm->emsg = "locked memory not available on this system";
 #endif
   {
     if ((p = malloc(sz)) == 0) {
@@ -295,6 +286,35 @@ void l_purge(lmem *lm)
   lm->free = l->sz;
 }
 
+/* --- @l_destroy@ --- *
+ *
+ * Arguments:	@lmem *lm@ = pointer to locked memory descriptor
+ *
+ * Returns:	---
+ *
+ * Use:		Disposes of a locked memory arena permanently.
+ */
+
+void l_destroy(lmem *lm)
+{
+  l_node *l;
+
+  l = lm->l;
+  while (l) {
+    l_node *ll = l->next;
+    DESTROY(l);
+    l = ll;
+  }
+  memset(lm->p, 0, lm->sz);
+
+#ifdef HAVE_MLOCK
+  if (lm->f & LF_LOCKED)
+    munmap(lm->p, lm->sz);
+  else
+#endif
+    free(lm->p); /*sic*/
+}
+
 /* --- @l_report@ --- *
  *
  * Arguments:	@lmem *lm@ = pointer to locked memory descriptor