|
@@ -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) {
|