diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 09:11:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 09:11:50 +0200 |
| commit | 48467641bcc057f7cba3b6cbbe66cb834d64cc81 (patch) | |
| tree | f7c5c5e964c220de30fcdcd06b0f1efdb3e22439 /security | |
| parent | [PATCH] s390: disconnected 3270 console (diff) | |
| parent | [ATM]: Fix dereference of uninitialized pointer in zatm (diff) | |
| download | linux-48467641bcc057f7cba3b6cbbe66cb834d64cc81.tar.xz linux-48467641bcc057f7cba3b6cbbe66cb834d64cc81.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'security')
| -rw-r--r-- | security/seclvl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/seclvl.c b/security/seclvl.c index c8e87b22c9bd..96b1f2122f67 100644 --- a/security/seclvl.c +++ b/security/seclvl.c @@ -321,7 +321,7 @@ plaintext_to_sha1(unsigned char *hash, const char *plaintext, int len) "bytes.\n", len, PAGE_SIZE); return -ENOMEM; } - tfm = crypto_alloc_tfm("sha1", 0); + tfm = crypto_alloc_tfm("sha1", CRYPTO_TFM_REQ_MAY_SLEEP); if (tfm == NULL) { seclvl_printk(0, KERN_ERR, "Failed to load transform for SHA1\n"); |