summaryrefslogtreecommitdiffstats
path: root/fs/ubifs/sb.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-10-02 14:21:34 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2018-10-08 08:36:58 +0200
commit65e3be9af4434785adb87be87c9cafb6bfdbb65e (patch)
treecf932903199d511cf350b5e2ea095d9f9033ad47 /fs/ubifs/sb.c
parent6ddc8ca036d002ed95e13609aaeb57600d9199b5 (diff)
downloadbarebox-65e3be9af4434785adb87be87c9cafb6bfdbb65e.tar.gz
barebox-65e3be9af4434785adb87be87c9cafb6bfdbb65e.tar.xz
fs: ubifs: optionally allow to mount UBIFS images with encrypted files
Currently we do not support the UBIFS file encryption feature. Nevertheless we can allow read clear files from UBIFS to be able to boot an unencrypted kernel. This differs from the Kernel behaviour, so add a globalvar to make that configurable. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs/ubifs/sb.c')
-rw-r--r--fs/ubifs/sb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c
index 48bfb24955..a13f092eb0 100644
--- a/fs/ubifs/sb.c
+++ b/fs/ubifs/sb.c
@@ -357,7 +357,7 @@ int ubifs_read_superblock(struct ubifs_info *c)
}
#ifndef CONFIG_UBIFS_FS_ENCRYPTION
- if (c->encrypted) {
+ if (c->encrypted && !ubifs_allow_encrypted) {
ubifs_err(c, "file system contains encrypted files but UBIFS"
" was built without crypto support.");
err = -EINVAL;