git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bluetooth: Verify that l2cap_get_conf_opt provides large enough buffer
[pandora-kernel.git]
/
crypto
/
gcm.c
diff --git
a/crypto/gcm.c
b/crypto/gcm.c
index
9e47c4d
..
9f74085
100644
(file)
--- a/
crypto/gcm.c
+++ b/
crypto/gcm.c
@@
-103,7
+103,7
@@
static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key,
struct crypto_ablkcipher *ctr = ctx->ctr;
struct {
be128 hash;
struct crypto_ablkcipher *ctr = ctx->ctr;
struct {
be128 hash;
- u8 iv[
8
];
+ u8 iv[
16
];
struct crypto_gcm_setkey_result result;
struct crypto_gcm_setkey_result result;
@@
-140,10
+140,8
@@
static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key,
err = crypto_ablkcipher_encrypt(&data->req);
if (err == -EINPROGRESS || err == -EBUSY) {
err = crypto_ablkcipher_encrypt(&data->req);
if (err == -EINPROGRESS || err == -EBUSY) {
- err = wait_for_completion_interruptible(
- &data->result.completion);
- if (!err)
- err = data->result.err;
+ wait_for_completion(&data->result.completion);
+ err = data->result.err;
}
if (err)
}
if (err)