diff options
| author | Jan Kara <jack@suse.cz> | 2009-02-10 11:15:34 -0500 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 2009-02-10 11:15:34 -0500 |
| commit | 7f5aa215088b817add9c71914b83650bdd49f8a9 (patch) | |
| tree | 9b811d1f0b41a2738fc68654ae605bf5d8cf2a72 /fs/ocfs2 | |
| parent | 9eddacf9e9c03578ef2c07c9534423e823d677f8 (diff) | |
| download | linux-3.10-7f5aa215088b817add9c71914b83650bdd49f8a9.tar.gz linux-3.10-7f5aa215088b817add9c71914b83650bdd49f8a9.tar.bz2 linux-3.10-7f5aa215088b817add9c71914b83650bdd49f8a9.zip | |
jbd2: Avoid possible NULL dereference in jbd2_journal_begin_ordered_truncate()
If we race with commit code setting i_transaction to NULL, we could
possibly dereference it. Proper locking requires the journal pointer
(to access journal->j_list_lock), which we don't have. So we have to
change the prototype of the function so that filesystem passes us the
journal pointer. Also add a more detailed comment about why the
function jbd2_journal_begin_ordered_truncate() does what it does and
how it should be used.
Thanks to Dan Carpenter <error27@gmail.com> for pointing to the
suspitious code.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Acked-by: Joel Becker <joel.becker@oracle.com>
CC: linux-ext4@vger.kernel.org
CC: ocfs2-devel@oss.oracle.com
CC: mfasheh@suse.de
CC: Dan Carpenter <error27@gmail.com>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/journal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h index 3c3532e1307..172850a9a12 100644 --- a/fs/ocfs2/journal.h +++ b/fs/ocfs2/journal.h @@ -513,8 +513,10 @@ static inline int ocfs2_jbd2_file_inode(handle_t *handle, struct inode *inode) static inline int ocfs2_begin_ordered_truncate(struct inode *inode, loff_t new_size) { - return jbd2_journal_begin_ordered_truncate(&OCFS2_I(inode)->ip_jinode, - new_size); + return jbd2_journal_begin_ordered_truncate( + OCFS2_SB(inode->i_sb)->journal->j_journal, + &OCFS2_I(inode)->ip_jinode, + new_size); } #endif /* OCFS2_JOURNAL_H */ |