diff options
| author |   Gilad Ben-Yossef <gilad@benyossef.com> | 2017-05-18 13:47:25 +0300 |
|---|---|---|
| committer |   Mike Snitzer <snitzer@redhat.com> | 2017-05-22 13:49:03 -0400 |
| commit | f52236e0b0a0820e938e16a776309e76b7bd6c43 (patch) | |
| tree | ca0094e3a1a789be5f5346c79884927e5e43e264 /drivers/md/dm-verity-target.c | |
| parent | Linux 4.12-rc2 (diff) | |
| download | linux-dev-f52236e0b0a0820e938e16a776309e76b7bd6c43.tar.xz linux-dev-f52236e0b0a0820e938e16a776309e76b7bd6c43.zip | |
dm verity: fix no salt use case
DM-Verity has an (undocumented) mode where no salt is used. This was
never handled directly by the DM-Verity code, instead working due to the
fact that calling crypto_shash_update() with a zero length data is an
implicit noop.
This is no longer the case now that we have switched to
crypto_ahash_update(). Fix the issue by introducing explicit handling
of the no salt use case to DM-Verity.
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Reported-by: Marian Csontos <mcsontos@redhat.com>
Fixes: d1ac3ff ("dm verity: switch to using asynchronous hash crypto API")
Tested-by: Milan Broz <gmazyland@gmail.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-verity-target.c')
| -rw-r--r-- | drivers/md/dm-verity-target.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c index 97de961a3bfc..1ec9b2c51c07 100644 --- a/drivers/md/dm-verity-target.c +++ b/drivers/md/dm-verity-target.c @@ -166,7 +166,7 @@ static int verity_hash_init(struct dm_verity *v, struct ahash_request *req, return r; } - if (likely(v->version >= 1)) + if (likely(v->salt_size && (v->version >= 1))) r = verity_hash_update(v, req, v->salt, v->salt_size, res); return r; @@ -177,7 +177,7 @@ static int verity_hash_final(struct dm_verity *v, struct ahash_request *req, { int r; - if (unlikely(!v->version)) { + if (unlikely(v->salt_size && (!v->version))) { r = verity_hash_update(v, req, v->salt, v->salt_size, res); if (r < 0) { |