Skip to contentSkip to conversation

mke2fs: Warn if page size != blocksize when ecnrypt is enabled

PATCH In review Lukas Czerner 2 participants 8 messages Aug 21, 2019 – Oct 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mke2fs: Warn if page size != blocksize when ecnrypt is enabled

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.

---
 misc/mke2fs.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
misc/mke2fs.c +20 -0
index d7cf257e..aa9590d8 100644
@@ -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))
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/2 tune2fs: Warn if page size != blocksize when enabling encrypt

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.

---
 misc/tune2fs.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
misc/tune2fs.c +38 -0
index 7d2d38d7..26b1b1d0 100644
@@ -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;
Signature · 1 line
2.21.0
#2 lore raw

Re: [PATCH 2/2] tune2fs: Warn if page size != blocksize when enabling encrypt

Quoted 30 lines · Lukas Czerner

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.

---
 misc/tune2fs.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
misc/tune2fs.c +5 -0
index 7d2d38d7..26b1b1d0 100644
@@ -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

misc/tune2fs.c mmp_error: · line 1424

Quoted 10 lines
misc/tune2fs.c +10 -0
+		 * 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"),

I wonder if this message should explicitly mention the encryption option, right now it doesn't give a lot of context as to why this is being printed.

Perhaps "Encryption feature requested, but block size (%dB) does not match ...?"

-Eric

Quoted 41 lines
misc/tune2fs.c +23 -0
+					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;
#3 lore raw

Re: [PATCH 2/2] tune2fs: Warn if page size != blocksize when enabling encrypt

Quoted 38 lines · Eric Sandeen
Quoted 35 lines · Lukas Czerner

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.

---
 misc/tune2fs.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
misc/tune2fs.c +10 -0
index 7d2d38d7..26b1b1d0 100644
@@ -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) {
Quoted 8 lines

misc/tune2fs.c mmp_error: · line 1424

Quoted 5 lines
misc/tune2fs.c +5 -0
+				com_err(program_name, 0,
+					_("Block size (%dB) does not match "
+					  "system page size (%dB). File "
+					  "system won't be usable on this "
+					  "system"),

I wonder if this message should explicitly mention the encryption option, right now it doesn't give a lot of context as to why this is being printed.

Ah right, I suppose people can change more things at once. I'll get it fixed.

Thanks!
-Lukas

Quoted 46 lines

Perhaps "Encryption feature requested, but block size (%dB) does not match ...?"

-Eric

Quoted 41 lines
misc/tune2fs.c +23 -0
+					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;
#4 lore raw

PATCH v2 2/2 tune2fs: Warn if page size != blocksize when enabling encrypt

In reply to Lukas Czerner

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.

---
 misc/tune2fs.c | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
misc/tune2fs.c +39 -0
index 7d2d38d7..f1604447 100644
@@ -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,30 @@ 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,
+					_("Encryption feature requested, but "
+					  "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 +2870,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 +2906,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;
Signature · 1 line
2.21.0
Reviewed-by on v2 2/2
#5 lore raw

Re: [PATCH v2 2/2] tune2fs: Warn if page size != blocksize when enabling encrypt

Quoted 38 lines · Lukas Czerner

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.

---
 misc/tune2fs.c | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
misc/tune2fs.c +13 -0
index 7d2d38d7..f1604447 100644
@@ -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,30 @@ 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,
+					_("Encryption feature requested, but "
+					  "block size (%dB) does not match "

misc/tune2fs.c mmp_error: · line 1432

Quoted 10 lines
misc/tune2fs.c +10 -0
+					  "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"),

"continue"

With that fix,

Quoted 34 lines
misc/tune2fs.c +16 -0
+				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 +2870,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 +2906,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;
Reviewed-by on v1 1/2
#6 lore raw
In reply to Lukas Czerner
Quoted 6 lines · Lukas Czerner

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.

This matches the warnings we give for block size > system page size, for example, so this makes sense to me.

Quoted 36 lines
---
 misc/mke2fs.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
misc/mke2fs.c +20 -0
index d7cf257e..aa9590d8 100644
@@ -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))
#7 lore raw
In reply to Lukas Czerner

ping

Quoted 44 lines · Lukas Czerner

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.

---
 misc/mke2fs.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
misc/mke2fs.c +20 -0
index d7cf257e..aa9590d8 100644
@@ -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))
Signature · 1 line
2.21.0