From aad597b987d1214085f0da4f955ebb64e8ddb82c Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 20 Apr 2017 09:10:18 +0200 Subject: [PATCH] Fix activation of verity device with superblock and FEC. --- lib/setup.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/setup.c b/lib/setup.c index cb258f7a..292ec508 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -618,9 +618,13 @@ static int _crypt_load_verity(struct crypt_device *cd, struct crypt_params_verit (r = crypt_set_data_device(cd, params->data_device)) < 0) return r; - if (params && params->fec_device && - (r = device_alloc(&cd->u.verity.fec_device, params->fec_device)) < 0) - return r; + if (params && params->fec_device) { + r = device_alloc(&cd->u.verity.fec_device, params->fec_device); + if (r < 0) + return r; + cd->u.verity.hdr.fec_area_offset = params->fec_area_offset; + cd->u.verity.hdr.fec_roots = params->fec_roots; + } return r; }