diff options
author | vanhu <vanhu@FreeBSD.org> | 2009-05-27 09:52:12 +0000 |
---|---|---|
committer | vanhu <vanhu@FreeBSD.org> | 2009-05-27 09:52:12 +0000 |
commit | f4846501539f352eab7f259e2ad18afd18bcd516 (patch) | |
tree | 7cc5efa5418d376c62e3562702200e9ab459342b /sys | |
parent | 48cef84e5fd897fd091510cbaa9c81f73e2d7fa6 (diff) | |
download | FreeBSD-src-f4846501539f352eab7f259e2ad18afd18bcd516.zip FreeBSD-src-f4846501539f352eab7f259e2ad18afd18bcd516.tar.gz |
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
Diffstat (limited to 'sys')
-rw-r--r-- | sys/crypto/via/padlock_hash.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/crypto/via/padlock_hash.c b/sys/crypto/via/padlock_hash.c index ae43197..71f956e 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; |