diff options
author | Jia-Ju Bai <baijiaju1990@gmail.com> | 2019-10-06 20:57:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-07 18:47:19 -0400 |
commit | 583fee3e12df0e6f1f66f063b989d8e7fed0e65a (patch) | |
tree | 931c6c1c8858cb2a91a153b6aceb3fec6088d84f | |
parent | 56e94ea132bb5c2c1d0b60a6aeb34dcb7d71a53d (diff) |
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 calling
ocfs2_update_inode_fsync_trans().
This bug is found by a static analysis tool STCheck written by us.
Link: http://lkml.kernel.org/r/20190726033705.32307-1-baijiaju1990@gmail.com
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/ocfs2/aops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 50d56d9a0475..9cd0a6815933 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c | |||
@@ -2049,7 +2049,8 @@ out_write_size: | |||
2049 | inode->i_mtime = inode->i_ctime = current_time(inode); | 2049 | inode->i_mtime = inode->i_ctime = current_time(inode); |
2050 | di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec); | 2050 | di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec); |
2051 | di->i_mtime_nsec = di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec); | 2051 | di->i_mtime_nsec = di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec); |
2052 | ocfs2_update_inode_fsync_trans(handle, inode, 1); | 2052 | if (handle) |
2053 | ocfs2_update_inode_fsync_trans(handle, inode, 1); | ||
2053 | } | 2054 | } |
2054 | if (handle) | 2055 | if (handle) |
2055 | ocfs2_journal_dirty(handle, wc->w_di_bh); | 2056 | ocfs2_journal_dirty(handle, wc->w_di_bh); |