[PATCH] tune2fs: exit directly when fs freed in ext2fs_run_ext3_journal

[PATCH] tune2fs: exit directly when fs freed in ext2fs_run_ext3_journal

[Li Jinlin]

In ext2fs_run_ext3_journal(), fs will be free and reallocate. But
reallocating by ext2fs_open() may fail in some cases, such as device
being offline at the same time. In these cases, goto closefs will
cause segfault, fix it by exiting directly.

Signed-off-by: Li Jinlin <lijinlin3@huawei.com>
---
 misc/tune2fs.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 088f87e5..ee57dc7c 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -3344,8 +3344,11 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"
 			com_err("tune2fs", retval,
 				"while recovering journal.\n");
 			printf(_("Please run e2fsck -fy %s.\n"), argv[1]);
-			rc = 1;
-			goto closefs;
+			if (fs) {
+				rc = 1;
+				goto closefs;
+			}
+			exit(1);
 		}
 		sb = fs->super;
 	}
-- 
2.23.0

Re: [PATCH] tune2fs: exit directly when fs freed in ext2fs_run_ext3_journal

[Li Jinlin]

friendly ping ...

Thanks,
Jinlin

Re: [PATCH] tune2fs: exit directly when fs freed in ext2fs_run_ext3_journal

[Theodore Ts'o]

On Fri, Sep 16, 2022 at 03:42:23PM +0800, Li Jinlin wrote:
> In ext2fs_run_ext3_journal(), fs will be free and reallocate. But
> reallocating by ext2fs_open() may fail in some cases, such as device
> being offline at the same time. In these cases, goto closefs will
> cause segfault, fix it by exiting directly.
> 
> Signed-off-by: Li Jinlin <lijinlin3@huawei.com>

Thanks, applied, although I simplified the patch a little:

@@ -3106,6 +3106,8 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"
                        com_err("tune2fs", retval,
                                "while recovering journal.\n");
                        printf(_("Please run e2fsck -fy %s.\n"), argv[1]);
+                       if (!fs)
+                               exit(1);
                        rc = 1;
                        goto closefs;
                }

					- Ted