diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-11-06 14:48:36 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2022-12-08 21:49:24 -0500 |
| commit | 4c0d5778385cb3618ff26a561ce41de2b7d9de70 (patch) | |
| tree | e0b19c2cd3051719842588445a2f8cedd4076921 /fs/ext4/ext4.h | |
| parent | 0fbcb5251fc81b58969b272c4fb7374a7b922e3e (diff) | |
| download | linux-4c0d5778385cb3618ff26a561ce41de2b7d9de70.tar.gz linux-4c0d5778385cb3618ff26a561ce41de2b7d9de70.tar.bz2 linux-4c0d5778385cb3618ff26a561ce41de2b7d9de70.zip | |
ext4: don't set up encryption key during jbd2 transaction
Commit a80f7fcf1867 ("ext4: fixup ext4_fc_track_* functions' signature")
extended the scope of the transaction in ext4_unlink() too far, making
it include the call to ext4_find_entry(). However, ext4_find_entry()
can deadlock when called from within a transaction because it may need
to set up the directory's encryption key.
Fix this by restoring the transaction to its original scope.
Reported-by: syzbot+1a748d0007eeac3ab079@syzkaller.appspotmail.com
Fixes: a80f7fcf1867 ("ext4: fixup ext4_fc_track_* functions' signature")
Cc: <stable@vger.kernel.org> # v5.10+
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20221106224841.279231-3-ebiggers@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ext4.h')
| -rw-r--r-- | fs/ext4/ext4.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 3afdd99bb214..4e739902dc03 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3620,8 +3620,8 @@ extern void ext4_initialize_dirent_tail(struct buffer_head *bh, unsigned int blocksize); extern int ext4_handle_dirty_dirblock(handle_t *handle, struct inode *inode, struct buffer_head *bh); -extern int __ext4_unlink(handle_t *handle, struct inode *dir, const struct qstr *d_name, - struct inode *inode); +extern int __ext4_unlink(struct inode *dir, const struct qstr *d_name, + struct inode *inode, struct dentry *dentry); extern int __ext4_link(struct inode *dir, struct inode *inode, struct dentry *dentry); |