fs: ocfs2: Fix a possible null-pointer dereference in ocfs2_write_end_nolock()
PATCH 2/3 fs: ocfs2: Fix a possible null-pointer dereference in ocfs2_write_end_nolock()
In ocfs2_write_end_nolock(), there are an if statement on lines 1976, 2047 and 2058, to check whether handle is NULL:
if (handle)
When handle is NULL, it is used on line 2045:
ocfs2_update_inode_fsync_trans(handle, inode, 1);
oi->i_sync_tid = handle->h_transaction->t_tid;Thus, a possible null-pointer dereference may occur.
To fix this bug, handle is checked before callingocfs2_update_inode_fsync_trans().
This bug is found by a static analysis tool STCheck written by us.
--- fs/ocfs2/aops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ocfs2/aops.c +2 -1
@@ -2042,7 +2042,8 @@ int ocfs2_write_end_nolock(struct address_space *mapping, inode->i_mtime = inode->i_ctime =current_time (inode); di->i_mtime = di->i_ctime =cpu_to_le64 (inode->i_mtime.tv_sec); di->i_mtime_nsec = di->i_ctime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec); -ocfs2_update_inode_fsync_trans (handle, inode,1 ); +if (handle) +ocfs2_update_inode_fsync_trans (handle, inode,1 ); }if (handle)ocfs2_journal_dirty (handle, wc->w_di_bh);
Signature · 1 line
2.17.0
Quoted 8 lines · Jia-Ju Bai
In
ocfs2_write_end_nolock(), there are an if statement on lines 1976, 2047 and 2058, to check whether handle is NULL:
if (handle)When handle is NULL, it is used on line 2045:
ocfs2_update_inode_fsync_trans(handle, inode, 1); oi->i_sync_tid = handle->h_transaction->t_tid;
Quoted 8 lines
Thus, a possible null-pointer dereference may occur.
To fix this bug, handle is checked before calling
ocfs2_update_inode_fsync_trans().This bug is found by a static analysis tool STCheck written by us.
Signed-off-by Jia-Ju Bai <[email protected]>
Looks good.
Quoted 19 lines
--- fs/ocfs2/aops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/ocfs2/aops.c +2
-1@@ -2042,7 +2042,8 @@ int ocfs2_write_end_nolock(struct address_space *mapping, inode->i_mtime = inode->i_ctime =current_time (inode); di->i_mtime = di->i_ctime =cpu_to_le64 (inode->i_mtime.tv_sec); di->i_mtime_nsec = di->i_ctime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec); -ocfs2_update_inode_fsync_trans (handle, inode,1 ); +if (handle) +ocfs2_update_inode_fsync_trans (handle, inode,1 ); }if (handle)ocfs2_journal_dirty (handle, wc->w_di_bh);
Hi Jia-ju,
Could you please point out how ->w_handle can be NULL if we are changing disk inode?
I just checked the ocfs2 code but can't find any clue ...
In my opinion, it's impossible to change disk inode without an existed journal transaction. If truly so, it's a another problem.
Thanks,
Changwei
Quoted 44 lines · Joseph Qi
Quoted 8 lines · Jia-Ju Bai
In
ocfs2_write_end_nolock(), there are an if statement on lines 1976, 2047 and 2058, to check whether handle is NULL:
if (handle)When handle is NULL, it is used on line 2045:
ocfs2_update_inode_fsync_trans(handle, inode, 1); oi->i_sync_tid = handle->h_transaction->t_tid;Quoted 8 lines
Thus, a possible null-pointer dereference may occur.
To fix this bug, handle is checked before calling
ocfs2_update_inode_fsync_trans().This bug is found by a static analysis tool STCheck written by us.
Signed-off-by Jia-Ju Bai <[email protected]>Looks good.
Reviewed-by Joseph Qi <[email protected]>Quoted 10 lines
--- fs/ocfs2/aops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/ocfs2/aops.c +0
-0fs/ocfs2/aops.c int ocfs2_write_end_nolock(struct address_space *mapping, · line 2049
Quoted 9 lines
fs/ocfs2/aops.c +2
-1@@ -2042,7 +2042,8 @@ int ocfs2_write_end_nolock(struct address_space *mapping, inode->i_mtime = inode->i_ctime =current_time (inode); di->i_mtime = di->i_ctime =cpu_to_le64 (inode->i_mtime.tv_sec); di->i_mtime_nsec = di->i_ctime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec); -ocfs2_update_inode_fsync_trans (handle, inode,1 ); +if (handle) +ocfs2_update_inode_fsync_trans (handle, inode,1 ); }if (handle)ocfs2_journal_dirty (handle, wc->w_di_bh);_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel at oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel