summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2003-07-31 20:35:11 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2003-07-31 20:35:11 +0000
commite8044ab2af2f30040de8b7da464c551850b7989d (patch)
treea32315619e7b53dc568296b13670e2d08086105b
parent5a31b61a77dde1556a33c686f102ba150ae53cf8 (diff)
pasto; lha@stacken.kth.se
-rw-r--r--sys/crypto/criov.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/crypto/criov.c b/sys/crypto/criov.c
index 0aba3c544b0..fe9866fa61e 100644
--- a/sys/crypto/criov.c
+++ b/sys/crypto/criov.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: criov.c,v 1.12 2003/06/03 15:51:28 deraadt Exp $ */
+/* $OpenBSD: criov.c,v 1.13 2003/07/31 20:35:10 markus Exp $ */
/*
* Copyright (c) 1999 Theo de Raadt
@@ -142,14 +142,15 @@ cuio_apply(struct uio *uio, int off, int len,
unsigned int count;
if (len < 0)
- panic("%s: len %d < 0", __func__, len);
+ panic("cuio_apply: len %d < 0", len);
if (off < 0)
- panic("%s: off %d < 0", __func__, off);
+ panic("cuio_apply: off %d < 0", off);
ind = 0;
while (off > 0) {
if (ind >= uio->uio_iovcnt)
- panic("m_apply: null mbuf in skip");
+ panic("cui_apply: ind %d >= uio_iovcnt %d for off",
+ ind, uio->uio_iovcnt);
uiolen = uio->uio_iov[ind].iov_len;
if (off < uiolen)
break;
@@ -158,7 +159,8 @@ cuio_apply(struct uio *uio, int off, int len,
}
while (len > 0) {
if (ind >= uio->uio_iovcnt)
- panic("m_apply: null mbuf");
+ panic("cui_apply: ind %d >= uio_iovcnt %d for len",
+ ind, uio->uio_iovcnt);
count = min(uio->uio_iov[ind].iov_len - off, len);
rval = f(fstate, uio->uio_iov[ind].iov_base + off, count);