linux-kernel - Re: [PATCH 1/2] ubifs: Use correct config name for encryption

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAFLxGvz1OAbqj=Hf4dyJ2SuUJjYCj2KMFhj-9nVE3mQzNoKH2A@mail.gmail.com>
Date:   Wed, 15 May 2019 21:54:51 +0200
From:   Richard Weinberger <richard.weinberger@...il.com>
To:     Richard Weinberger <richard@....at>
Cc:     linux-mtd@...ts.infradead.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 1/2] ubifs: Use correct config name for encryption

On Tue, May 14, 2019 at 9:11 PM Richard Weinberger <richard@....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@...nel.org>
> Fixes: eea2c05d927b ("ubifs: Remove #ifdef around CONFIG_FS_ENCRYPTION")
> Signed-off-by: Richard Weinberger <richard@....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