aboutsummaryrefslogtreecommitdiff
path: root/sys/crypto/via
diff options
context:
space:
mode:
authorVANHULLEBUS Yvan <vanhu@FreeBSD.org>2009-05-27 09:52:12 +0000
committerVANHULLEBUS Yvan <vanhu@FreeBSD.org>2009-05-27 09:52:12 +0000
commit081b9301bf85ea34ffa5bfd5dd879eaa9dec7ca4 (patch)
tree7cc5efa5418d376c62e3562702200e9ab459342b /sys/crypto/via
parentaa1faa5fc62c7829c2248761d934a5456d42cb1a (diff)
downloadsrc-081b9301bf85ea34ffa5bfd5dd879eaa9dec7ca4.tar.gz
src-081b9301bf85ea34ffa5bfd5dd879eaa9dec7ca4.zip
Changed to M_NOWAIT when reallocing psc_buf in padlock_sha_update(),
as we already hold the non sleepable crypto_driver_mutex. Approved by: gnn(mentor) Obtained from: NETASQ MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=192883
Diffstat (limited to 'sys/crypto/via')
-rw-r--r--sys/crypto/via/padlock_hash.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/crypto/via/padlock_hash.c b/sys/crypto/via/padlock_hash.c
index ae431978faa5..71f956e52908 100644
--- a/sys/crypto/via/padlock_hash.c
+++ b/sys/crypto/via/padlock_hash.c
@@ -171,7 +171,9 @@ padlock_sha_update(struct padlock_sha_ctx *ctx, uint8_t *buf, uint16_t bufsize)
if (ctx->psc_size - ctx->psc_offset < bufsize) {
ctx->psc_size = MAX(ctx->psc_size * 2, ctx->psc_size + bufsize);
ctx->psc_buf = realloc(ctx->psc_buf, ctx->psc_size, M_PADLOCK,
- M_WAITOK);
+ M_NOWAIT);
+ if(ctx->psc_buf == NULL)
+ return (ENOMEM);
}
bcopy(buf, ctx->psc_buf + ctx->psc_offset, bufsize);
ctx->psc_offset += bufsize;