From cef0495f7a536256252a559c88266c8d272bfdb1 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Thu, 18 Oct 2018 16:37:14 +0200 Subject: mkfs.ubifs: More fscryptctl compatibility fscryptctl reads up to FS_MAX_KEY_SIZE bytes from the source key to compute the descriptor. Signed-off-by: Richard Weinberger Signed-off-by: David Oberhollenzer --- ubifs-utils/mkfs.ubifs/fscrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubifs-utils/mkfs.ubifs/fscrypt.c b/ubifs-utils/mkfs.ubifs/fscrypt.c index 29dad1b..3d4bff6 100644 --- a/ubifs-utils/mkfs.ubifs/fscrypt.c +++ b/ubifs-utils/mkfs.ubifs/fscrypt.c @@ -202,7 +202,7 @@ static int load_master_key(const char *key_file, struct cipher *fsc) return -1; } - keysize = read(kf, fscrypt_masterkey, fsc->key_length); + keysize = read(kf, fscrypt_masterkey, FS_MAX_KEY_SIZE); if (keysize < 0) { sys_errmsg("read '%s'", key_file); goto fail; -- cgit v1.2.3