summaryrefslogtreecommitdiff
path: root/share/man
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-11-02 05:16:44 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-11-02 05:16:44 +0000
commit29d41d7a4c314ea5b4bfb7321bd5400b048ca947 (patch)
treef3872acf1f15c426f20f4c315a921110980cfdef /share/man
parent7db62bffcc9cc0efbe618621b56dc8959cfb6015 (diff)
tweak wording and update panic messages
Diffstat (limited to 'share/man')
-rw-r--r--share/man/man9/malloc.922
1 files changed, 18 insertions, 4 deletions
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index 4c1dde505dd..eeaaaf5d066 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -1,4 +1,4 @@
-.\" $OpenBSD: malloc.9,v 1.59 2014/08/20 11:23:42 mikeb Exp $
+.\" $OpenBSD: malloc.9,v 1.60 2014/11/02 05:16:43 tedu Exp $
.\" $NetBSD: malloc.9,v 1.2 1996/10/30 05:29:54 lukem Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: August 20 2014 $
+.Dd $Mdocdate: November 2 2014 $
.Dt MALLOC 9
.Os
.Sh NAME
@@ -69,7 +69,9 @@ that was previously allocated by
or
.Fn mallocarray
for re-use.
-The size of the object should be specified by
+The same object size originally provided to
+.Fn malloc
+should be specified by
.Fa size .
If
.Fa addr
@@ -346,7 +348,7 @@ Failing consistency checks will cause a panic or a system console message:
.Bl -bullet -offset indent -compact
.It
panic:
-.Dq malloc - bogus type
+.Dq malloc: bogus type
.It
panic:
.Dq malloc: out of space in kmem_map
@@ -361,6 +363,9 @@ panic:
.Dq malloc: lost data
.It
panic:
+.Dq mallocarray: overflow
+.It
+panic:
.Dq free: unaligned addr
.It
panic:
@@ -370,6 +375,15 @@ panic:
.Dq free: multiple frees
.It
panic:
+.Dq free: non-malloced addr
+.It
+panic:
+.Dq free: size too large
+.It
+panic:
+.Dq free: size too small
+.It
+panic:
.Dq kmeminit: minbucket too small/struct freelist too big
.It
.Dq multiply freed item Aq addr