ext4: Unregister sysfs path before destroying jbd2 journal
Subsystems (2)
PATCH 1/1 ext4: Unregister sysfs path before destroying jbd2 journal
Call ext4_unregister_sysfs(), before destroying jbd2 journal, since below might cause, NULL pointer dereference issue. This got reported with LTP tests.
ext4_put_super() cat /sys/fs/ext4/loop2/journal_task
| ext4_attr_show();
ext4_jbd2_journal_destroy(); |
| journal_task_show()
| |
| task_pid_vnr(NULL);sbi->s_journal = NULL;
--- fs/ext4/super.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/ext4/super.c +7 -1
@@ -1024,6 +1024,13 @@ static void ext4_put_super(struct super_block *sb)destroy_workqueue (sbi->rsv_conversion_wq); +/* +* Unregister sysfs before destroying jbd2 journal. +* Since we could still access attr_journal_task attribute via sysfs +* path which could have sbi->s_journal->j_task as NULL +*/ +ext4_unregister_sysfs (sb); +if (sbi->s_journal) { aborted =is_journal_aborted (sbi->s_journal); err =jbd2_journal_destroy (sbi->s_journal);
@@ -1034,7 +1041,6 @@ static void ext4_put_super(struct super_block *sb) } } -ext4_unregister_sysfs (sb);ext4_es_unregister_shrinker (sbi);del_timer_sync (&sbi->s_err_report);ext4_release_system_zone (sb);
Signature · 1 line
2.21.0
Quoted 5 lines · Ritesh Harjani
Call
ext4_unregister_sysfs(), before destroying jbd2 journal, since below might cause, NULL pointer dereference issue. This got reported with LTP tests.
ext4_put_super()cat/sys/fs/ext4/loop2/journal_task
Quoted 8 lines
| ext4_attr_show(); ext4_jbd2_journal_destroy(); | | journal_task_show() | | | task_pid_vnr(NULL);
sbi->s_journal= NULL;Signed-off-by Ritesh Harjani <[email protected]>
Yeah, makes sence. Thanks for the patch! You can add:
Honza
Quoted 33 lines
--- fs/ext4/super.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)fs/ext4/super.c +7
-1@@ -1024,6 +1024,13 @@ static void ext4_put_super(struct super_block *sb)destroy_workqueue (sbi->rsv_conversion_wq); +/* +* Unregister sysfs before destroying jbd2 journal. +* Since we could still access attr_journal_task attribute via sysfs +* path which could have sbi->s_journal->j_task as NULL +*/ +ext4_unregister_sysfs (sb); +if (sbi->s_journal) { aborted =is_journal_aborted (sbi->s_journal); err =jbd2_journal_destroy (sbi->s_journal);@@ -1034,7 +1041,6 @@ static void ext4_put_super(struct super_block *sb) } } -ext4_unregister_sysfs (sb);ext4_es_unregister_shrinker (sbi);del_timer_sync (&sbi->s_err_report);ext4_release_system_zone (sb);Signature · 1 line
2.21.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 13 lines · Jan Kara
Quoted 12 lines · Ritesh Harjani
Call
ext4_unregister_sysfs(), before destroying jbd2 journal, since below might cause, NULL pointer dereference issue. This got reported with LTP tests.
ext4_put_super()cat/sys/fs/ext4/loop2/journal_task| ext4_attr_show(); ext4_jbd2_journal_destroy(); | | journal_task_show() | | | task_pid_vnr(NULL);
sbi->s_journal= NULL;
Quoted 5 lines
Quoted 1 line
Signed-off-by Ritesh Harjani <[email protected]>Yeah, makes sence. Thanks for the patch! You can add:
Reviewed-by Jan Kara <[email protected]>
Applied, thanks.
- Ted