summaryrefslogtreecommitdiffstats
path: root/bin/sh/memalloc.c
diff options
context:
space:
mode:
authorstefanf <stefanf@FreeBSD.org>2005-10-28 10:45:19 +0000
committerstefanf <stefanf@FreeBSD.org>2005-10-28 10:45:19 +0000
commit54091cfc827e8a2a18fc61f70f5c2fae197d6997 (patch)
tree90a53b77b5ce252eb80e70be38ddf646e528c634 /bin/sh/memalloc.c
parent175c41b86af872bde2bead127e56ad848b0e3eb7 (diff)
downloadFreeBSD-src-54091cfc827e8a2a18fc61f70f5c2fae197d6997.zip
FreeBSD-src-54091cfc827e8a2a18fc61f70f5c2fae197d6997.tar.gz
Protect malloc, realloc and free calls with INT{ON,OFF} directly in chkalloc,
ckrealloc and ckfree (added), respectively. sh jumps out of the signal handler using longjmp which is obviously a bad idea during malloc calls. Note: I think there is still a small race here because volatile sig_atomic_t only guarantees atomic reads and writes while we're doing increments and decrements. Protect a setmode call with INT{ON,OFF} as it calls malloc internally. PR: 45478 Patch from: Nate Eldredge
Diffstat (limited to 'bin/sh/memalloc.c')
-rw-r--r--bin/sh/memalloc.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index 60f9203..115eea0 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -57,7 +57,10 @@ ckmalloc(int nbytes)
{
pointer p;
- if ((p = malloc(nbytes)) == NULL)
+ INTOFF;
+ p = malloc(nbytes);
+ INTON;
+ if (p == NULL)
error("Out of space");
return p;
}
@@ -70,11 +73,22 @@ ckmalloc(int nbytes)
pointer
ckrealloc(pointer p, int nbytes)
{
- if ((p = realloc(p, nbytes)) == NULL)
+ INTOFF;
+ p = realloc(p, nbytes);
+ INTON;
+ if (p == NULL)
error("Out of space");
return p;
}
+void
+ckfree(pointer p)
+{
+ INTOFF;
+ free(p);
+ INTON;
+}
+
/*
* Make a copy of a string in safe storage.
OpenPOWER on IntegriCloud