/* -*-c-*-
*
- * $Id: lmem.c,v 1.1 1999/12/22 16:02:52 mdw Exp $
+ * $Id: lmem.c,v 1.6 2004/04/08 01:36:15 mdw Exp $
*
* Locked memory allocation (Unix-specific)
*
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: lmem.c,v $
- * 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"
# include <sys/mman.h>
#endif
+#include <mLib/arena.h>
#include <mLib/dstr.h>
#include <mLib/sub.h>
#include "lmem.h"
+/*----- Arena operations --------------------------------------------------*/
+
+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 const arena_ops l_ops = { aalloc, arena_fakerealloc, afree, apurge };
+
/*----- Main code ---------------------------------------------------------*/
/* --- @l_init@ --- *
/* --- Preliminaries --- */
+ lm->a.ops = &l_ops;
lm->err = 0;
+ lm->f = 0;
/* --- Try making a secure locked passphrase buffer --- *
*
lm->err = errno;
munmap(p, sz);
p = 0;
- }
+ } else
+ lm->f |= LF_LOCKED;
#endif
#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) {
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);
+
+ if (lm->f & LF_LOCKED)
+ munmap(lm->p, lm->sz);
+ else
+ free(lm->p);
+}
+
/* --- @l_report@ --- *
*
* Arguments: @lmem *lm@ = pointer to locked memory descriptor