Skip to content
This repository was archived by the owner on Oct 15, 2021. It is now read-only.

Commit 2b6575e

Browse files
Jiufei Xuegregkh
Jiufei Xue
authored andcommitted
ext4: fix NULL pointer dereference while journal is aborted
commit fa30dde upstream. We see the following NULL pointer dereference while running xfstests generic/475: BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 PGD 8000000c84bad067 P4D 8000000c84bad067 PUD c84e62067 PMD 0 Oops: 0000 [OnePlusOSS#1] SMP PTI CPU: 7 PID: 9886 Comm: fsstress Kdump: loaded Not tainted 5.0.0-rc8 OnePlusOSS#10 RIP: 0010:ext4_do_update_inode+0x4ec/0x760 ... Call Trace: ? jbd2_journal_get_write_access+0x42/0x50 ? __ext4_journal_get_write_access+0x2c/0x70 ? ext4_truncate+0x186/0x3f0 ext4_mark_iloc_dirty+0x61/0x80 ext4_mark_inode_dirty+0x62/0x1b0 ext4_truncate+0x186/0x3f0 ? unmap_mapping_pages+0x56/0x100 ext4_setattr+0x817/0x8b0 notify_change+0x1df/0x430 do_truncate+0x5e/0x90 ? generic_permission+0x12b/0x1a0 This is triggered because the NULL pointer handle->h_transaction was dereferenced in function ext4_update_inode_fsync_trans(). I found that the h_transaction was set to NULL in jbd2__journal_restart but failed to attached to a new transaction while the journal is aborted. Fix this by checking the handle before updating the inode. Fixes: b436b9b ("ext4: Wait for proper transaction commit on fsync") Signed-off-by: Jiufei Xue <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Reviewed-by: Joseph Qi <[email protected]> Cc: [email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 2f59c12 commit 2b6575e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/ext4/ext4_jbd2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ static inline void ext4_update_inode_fsync_trans(handle_t *handle,
372372
{
373373
struct ext4_inode_info *ei = EXT4_I(inode);
374374

375-
if (ext4_handle_valid(handle)) {
375+
if (ext4_handle_valid(handle) && !is_handle_aborted(handle)) {
376376
ei->i_sync_tid = handle->h_transaction->t_tid;
377377
if (datasync)
378378
ei->i_datasync_tid = handle->h_transaction->t_tid;

0 commit comments

Comments
 (0)