]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
tune2fs: exit directly when fs freed in ext2fs_run_ext3_journal
authorLi Jinlin <lijinlin3@huawei.com>
Fri, 16 Sep 2022 07:42:23 +0000 (15:42 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 20 Oct 2022 15:02:18 +0000 (11:02 -0400)
In ext2fs_run_ext3_journal(), fs will be freed and reallocated.
However, the reallocation by ext2fs_open() may fail in some cases ---
for example, when the device becomes offline.  To avoid a segfault,
exit if fs is NULL.

[ Simplified the patch by by simply exiting if fs is NULL -TYT ]

Signed-off-by: Li Jinlin <lijinlin3@huawei.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
misc/tune2fs.c

index bed3d95b65846518002c07bddde5501aa5ff824b..f566ed81422cb8be86253d46a8a8352671113d81 100644 (file)
@@ -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;
                }