* [PATCH 1/2] ubifs: Use correct config name for encryption
@ 2019-05-14 19:10 Richard Weinberger
2019-05-14 19:10 ` [PATCH 2/2] ubifs: Convert xattr inum to host order Richard Weinberger
2019-05-15 19:54 ` [PATCH 1/2] ubifs: Use correct config name for encryption Richard Weinberger
0 siblings, 2 replies; 3+ messages in thread
From: Richard Weinberger @ 2019-05-14 19:10 UTC (permalink / raw)
To: linux-mtd; +Cc: linux-kernel, Richard Weinberger
CONFIG_UBIFS_FS_ENCRYPTION is gone, fscrypt is now
controlled via CONFIG_FS_ENCRYPTION.
This problem slipped into the tree because of a mis-merge on
my side.
Reported-by: Eric Biggers <ebiggers@kernel.org>
Fixes: eea2c05d927b ("ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION")
Signed-off-by: Richard Weinberger <richard@nod.at>
---
fs/ubifs/sb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c
index 2afc8b1d4c3b..3ca41965db6e 100644
--- a/fs/ubifs/sb.c
+++ b/fs/ubifs/sb.c
@@ -748,7 +748,7 @@ int ubifs_read_superblock(struct ubifs_info *c)
goto out;
}
- if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION) && c->encrypted) {
+ if (!IS_ENABLED(CONFIG_FS_ENCRYPTION) && c->encrypted) {
ubifs_err(c, "file system contains encrypted files but UBIFS"
" was built without crypto support.");
err = -EINVAL;
@@ -941,7 +941,7 @@ int ubifs_enable_encryption(struct ubifs_info *c)
int err;
struct ubifs_sb_node *sup = c->sup_node;
- if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION))
+ if (!IS_ENABLED(CONFIG_FS_ENCRYPTION))
return -EOPNOTSUPP;
if (c->encrypted)
--
2.16.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ubifs: Convert xattr inum to host order
2019-05-14 19:10 [PATCH 1/2] ubifs: Use correct config name for encryption Richard Weinberger
@ 2019-05-14 19:10 ` Richard Weinberger
2019-05-15 19:54 ` [PATCH 1/2] ubifs: Use correct config name for encryption Richard Weinberger
1 sibling, 0 replies; 3+ messages in thread
From: Richard Weinberger @ 2019-05-14 19:10 UTC (permalink / raw)
To: linux-mtd; +Cc: linux-kernel, Richard Weinberger
UBIFS stores inode numbers as LE64 integers.
We have to convert them to host oder, otherwise
BE hosts won't be able to use the integer correctly.
Reported-by: kbuild test robot <lkp@intel.com>
Fixes: 9ca2d7326444 ("ubifs: Limit number of xattrs per inode")
Signed-off-by: Richard Weinberger <richard@nod.at>
---
fs/ubifs/xattr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index acab3181ab35..bcfed27e8997 100644
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -527,7 +527,7 @@ int ubifs_purge_xattrs(struct inode *host)
fname_name(&nm) = xent->name;
fname_len(&nm) = le16_to_cpu(xent->nlen);
- xino = ubifs_iget(c->vfs_sb, xent->inum);
+ xino = ubifs_iget(c->vfs_sb, le64_to_cpu(xent->inum));
if (IS_ERR(xino)) {
err = PTR_ERR(xino);
ubifs_err(c, "dead directory entry '%s', error %d",
--
2.16.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] ubifs: Use correct config name for encryption
2019-05-14 19:10 [PATCH 1/2] ubifs: Use correct config name for encryption Richard Weinberger
2019-05-14 19:10 ` [PATCH 2/2] ubifs: Convert xattr inum to host order Richard Weinberger
@ 2019-05-15 19:54 ` Richard Weinberger
1 sibling, 0 replies; 3+ messages in thread
From: Richard Weinberger @ 2019-05-15 19:54 UTC (permalink / raw)
To: Richard Weinberger; +Cc: linux-mtd, LKML
On Tue, May 14, 2019 at 9:11 PM Richard Weinberger <richard@nod.at> wrote:
>
> CONFIG_UBIFS_FS_ENCRYPTION is gone, fscrypt is now
> controlled via CONFIG_FS_ENCRYPTION.
> This problem slipped into the tree because of a mis-merge on
> my side.
>
> Reported-by: Eric Biggers <ebiggers@kernel.org>
> Fixes: eea2c05d927b ("ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION")
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
> fs/ubifs/sb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c
> index 2afc8b1d4c3b..3ca41965db6e 100644
> --- a/fs/ubifs/sb.c
> +++ b/fs/ubifs/sb.c
> @@ -748,7 +748,7 @@ int ubifs_read_superblock(struct ubifs_info *c)
> goto out;
> }
>
> - if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION) && c->encrypted) {
> + if (!IS_ENABLED(CONFIG_FS_ENCRYPTION) && c->encrypted) {
> ubifs_err(c, "file system contains encrypted files but UBIFS"
> " was built without crypto support.");
> err = -EINVAL;
> @@ -941,7 +941,7 @@ int ubifs_enable_encryption(struct ubifs_info *c)
> int err;
> struct ubifs_sb_node *sup = c->sup_node;
>
> - if (!IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION))
> + if (!IS_ENABLED(CONFIG_FS_ENCRYPTION))
> return -EOPNOTSUPP;
>
> if (c->encrypted)
> --
> 2.16.4
Applied both.
--
Thanks,
//richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-15 19:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-14 19:10 [PATCH 1/2] ubifs: Use correct config name for encryption Richard Weinberger
2019-05-14 19:10 ` [PATCH 2/2] ubifs: Convert xattr inum to host order Richard Weinberger
2019-05-15 19:54 ` [PATCH 1/2] ubifs: Use correct config name for encryption Richard Weinberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).