From patchwork Wed Aug 21 13:18:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Czerner X-Patchwork-Id: 1150839 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46D7Wr3r16z9s3Z for ; Wed, 21 Aug 2019 23:18:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728767AbfHUNSP (ORCPT ); Wed, 21 Aug 2019 09:18:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41428 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728219AbfHUNSP (ORCPT ); Wed, 21 Aug 2019 09:18:15 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E66AE8535D for ; Wed, 21 Aug 2019 13:18:14 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-107.brq.redhat.com [10.40.204.107]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F3375D9D3 for ; Wed, 21 Aug 2019 13:18:14 +0000 (UTC) From: Lukas Czerner To: linux-ext4@vger.kernel.org Subject: [PATCH 1/2] mke2fs: Warn if page size != blocksize when ecnrypt is enabled Date: Wed, 21 Aug 2019 15:18:12 +0200 Message-Id: <20190821131813.9456-1-lczerner@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 21 Aug 2019 13:18:14 +0000 (UTC) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org With encrypt feature enabled the file system block size must match system page size. Currently mke2fs will not complain at all when we try to create a file system that does not satisfy this requirement for the system. Add a warning for this case. Signed-off-by: Lukas Czerner Reviewed-by: Eric Sandeen --- misc/mke2fs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/misc/mke2fs.c b/misc/mke2fs.c index d7cf257e..aa9590d8 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -2468,6 +2468,26 @@ profile_error: exit (1); } + /* + * Encrypt feature requires blocksize to be the same as page size, + * otherwise file system won't mount + */ + if (ext2fs_has_feature_encrypt(&fs_param) && + (blocksize != sys_page_size)) { + if (!force) { + com_err(program_name, 0, + _("Encrypt feature is enabled, but block size " + "(%dB) does not match system page size " + "(%dB)"), + blocksize, sys_page_size); + proceed_question(proceed_delay); + } + fprintf(stderr,_("Warning: Encrypt feature enabled, but block " + "size (%dB) does not match system page size " + "(%dB), forced to continue\n"), + blocksize, sys_page_size); + } + /* Don't allow user to set both metadata_csum and uninit_bg bits. */ if (ext2fs_has_feature_metadata_csum(&fs_param) && ext2fs_has_feature_gdt_csum(&fs_param)) From patchwork Wed Aug 21 13:18:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Czerner X-Patchwork-Id: 1150840 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46D7Ws051Vz9sML for ; Wed, 21 Aug 2019 23:18:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728862AbfHUNSQ (ORCPT ); Wed, 21 Aug 2019 09:18:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37316 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728219AbfHUNSP (ORCPT ); Wed, 21 Aug 2019 09:18:15 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D0D25C049E32 for ; Wed, 21 Aug 2019 13:18:15 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-107.brq.redhat.com [10.40.204.107]) by smtp.corp.redhat.com (Postfix) with ESMTP id 485EB5D9D3 for ; Wed, 21 Aug 2019 13:18:15 +0000 (UTC) From: Lukas Czerner To: linux-ext4@vger.kernel.org Subject: [PATCH 2/2] tune2fs: Warn if page size != blocksize when enabling encrypt Date: Wed, 21 Aug 2019 15:18:13 +0200 Message-Id: <20190821131813.9456-2-lczerner@redhat.com> In-Reply-To: <20190821131813.9456-1-lczerner@redhat.com> References: <20190821131813.9456-1-lczerner@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 21 Aug 2019 13:18:15 +0000 (UTC) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org With encrypt feature enabled the file system block size must match system page size. Currently tune2fs will not complain at all when we try to enable encrypt on a file system that does not satisfy this requirement for the system. Add a warning for this case. Signed-off-by: Lukas Czerner --- misc/tune2fs.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 7d2d38d7..26b1b1d0 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -130,6 +130,8 @@ void do_findfs(int argc, char **argv); int journal_enable_debug = -1; #endif +static int sys_page_size = 4096; + static void usage(void) { fprintf(stderr, @@ -1407,6 +1409,29 @@ mmp_error: stderr); return 1; } + + /* + * When encrypt feature is enabled, the file system blocksize + * needs to match system page size otherwise the file system + * won't mount. + */ + if (fs->blocksize != sys_page_size) { + if (!f_flag) { + com_err(program_name, 0, + _("Block size (%dB) does not match " + "system page size (%dB). File " + "system won't be usable on this " + "system"), + fs->blocksize, sys_page_size); + proceed_question(-1); + } + fprintf(stderr,_("Warning: Encrypt feature enabled, " + "but block size (%dB) does not match " + "system page size (%dB), forced to " + "cointinue\n"), + fs->blocksize, sys_page_size); + } + fs->super->s_encrypt_algos[0] = EXT4_ENCRYPTION_MODE_AES_256_XTS; fs->super->s_encrypt_algos[1] = @@ -2844,6 +2869,7 @@ int main(int argc, char **argv) int tune2fs_main(int argc, char **argv) #endif /* BUILD_AS_LIB */ { + long sysval; errcode_t retval; ext2_filsys fs; struct ext2_super_block *sb; @@ -2879,6 +2905,18 @@ int tune2fs_main(int argc, char **argv) #endif io_ptr = unix_io_manager; + /* Determine the system page size if possible */ +#ifdef HAVE_SYSCONF +#if (!defined(_SC_PAGESIZE) && defined(_SC_PAGE_SIZE)) +#define _SC_PAGESIZE _SC_PAGE_SIZE +#endif +#ifdef _SC_PAGESIZE + sysval = sysconf(_SC_PAGESIZE); + if (sysval > 0) + sys_page_size = sysval; +#endif /* _SC_PAGESIZE */ +#endif /* HAVE_SYSCONF */ + retry_open: if ((open_flag & EXT2_FLAG_RW) == 0 || f_flag) open_flag |= EXT2_FLAG_SKIP_MMP;