git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pending' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
[sfrench/cifs-2.6.git]
/
drivers
/
md
/
dm-crypt.c
diff --git
a/drivers/md/dm-crypt.c
b/drivers/md/dm-crypt.c
index 1c159ac68c98f2372ffebe58f363fa1ff6e63a80..28c6ae095c560d9377aa5e182e8b8af38de11117 100644
(file)
--- a/
drivers/md/dm-crypt.c
+++ b/
drivers/md/dm-crypt.c
@@
-168,7
+168,7
@@
static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
return -ENOMEM;
}
- sg_
set_buf
(&sg, cc->key, cc->key_size);
+ sg_
init_one
(&sg, cc->key, cc->key_size);
desc.tfm = hash_tfm;
desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
err = crypto_hash_digest(&desc, &sg, cc->key_size, salt);