f2fs: reject test_dummy_encryption when !CONFIG_FS_ENCRYPTION

ebiggers · Jaegeuk Kim · commit 64e3ed0b8ea0 · 2022-05-12T10:14:03.000-07:00
There is no good reason to allow this mount option when the kernel isn't
configured with encryption support.  Since this option is only for
testing, we can just fix this; we don't really need to worry about
breaking anyone who might be counting on this option being ignored.

Signed-off-by: Eric Biggers &lt;ebiggers@google.com&gt;
Signed-off-by: Jaegeuk Kim &lt;jaegeuk@kernel.org&gt;
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
@@ -525,10 +525,11 @@ static int f2fs_set_test_dummy_encryption(struct super_block *sb,
 		return -EINVAL;
 	}
 	f2fs_warn(sbi, "Test dummy encryption mode enabled");
+	return 0;
 #else
-	f2fs_warn(sbi, "Test dummy encryption mount option ignored");
+	f2fs_warn(sbi, "test_dummy_encryption option not supported");
+	return -EINVAL;
 #endif
-	return 0;
 }
 
 #ifdef CONFIG_F2FS_FS_COMPRESSION

Original file line number	Diff line number	Diff line change
`@@ -525,10 +525,11 @@ static int f2fs_set_test_dummy_encryption(struct super_block *sb,`
`525`	`525`	`return -EINVAL;`
`526`	`526`	`}`
`527`	`527`	`f2fs_warn(sbi, "Test dummy encryption mode enabled");`
	`528`	`+ return 0;`
`528`	`529`	`#else`
`529`		`- f2fs_warn(sbi, "Test dummy encryption mount option ignored");`
	`530`	`+ f2fs_warn(sbi, "test_dummy_encryption option not supported");`
	`531`	`+ return -EINVAL;`
`530`	`532`	`#endif`
`531`		`- return 0;`
`532`	`533`	`}`
`533`	`534`
`534`	`535`	`#ifdef CONFIG_F2FS_FS_COMPRESSION`