diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-10-02 14:21:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-10-08 08:36:58 +0200 |
| commit | 65e3be9af4434785adb87be87c9cafb6bfdbb65e (patch) | |
| tree | cf932903199d511cf350b5e2ea095d9f9033ad47 | |
| parent | 6ddc8ca036d002ed95e13609aaeb57600d9199b5 (diff) | |
| download | barebox-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>
| -rw-r--r-- | fs/ubifs/sb.c | 2 | ||||
| -rw-r--r-- | fs/ubifs/ubifs.c | 9 | ||||
| -rw-r--r-- | fs/ubifs/ubifs.h | 1 |
3 files changed, 11 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; diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 11fb3187ad..bbe382dab0 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -15,6 +15,8 @@ #include <common.h> #include <init.h> #include <fs.h> +#include <globalvar.h> +#include <magicvar.h> #include <linux/stat.h> #include <linux/zlib.h> #include <linux/mtd/mtd.h> @@ -501,6 +503,8 @@ static int zlib_decomp_init(void) return 0; } +int ubifs_allow_encrypted; + static int ubifs_init(void) { int ret; @@ -511,7 +515,12 @@ static int ubifs_init(void) return ret; } + globalvar_add_simple_bool("ubifs.allow_encrypted", &ubifs_allow_encrypted); + return register_fs_driver(&ubifs_driver); } coredevice_initcall(ubifs_init); + +BAREBOX_MAGICVAR_NAMED(global_ubifs_allow_encrypted, global.ubifs.allow_encrypted, + "If true, allow to mount UBIFS with encrypted files"); diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 900cc31177..01aa8986f3 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -48,6 +48,7 @@ struct iattr; struct kstat; +extern int ubifs_allow_encrypted; /* uapi/linux/limits.h */ #define XATTR_LIST_MAX 65536 /* size of extended attribute namelist (64k) */ |