/* -*-c-*-
*
- * $Id: lmem.c,v 1.2 2000/06/17 11:29:20 mdw Exp $
+ * $Id$
*
* Locked memory allocation (Unix-specific)
*
* (c) 1999 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of Catacomb.
*
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
- *
+ *
* Catacomb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with Catacomb; if not, write to the Free
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* 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"
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 ---------------------------------------------------------*/
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);
+
+#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