ocfs2: fix uninitialized variable in ocfs2_dio_wr_get_block()
Subsystems (2)
PATCH 1/1 ocfs2: fix uninitialized variable in ocfs2_dio_wr_get_block()
The callers assume that "*fsdata" is set on the success path, but that's not necessarily true on this path.
---
Please review this one EXTRA CAREFULLY. It's from static analysis and the truth is I'm not 100% sure it's correct. I'm also not sure that it's a complete fix.
Especially, please review how this is called from ocfs2_write_begin() to make sure that this doesn't break anything.
fs/ocfs2/aops.c | 1 + 1 file changed, 1 insertion(+)
fs/ocfs2/aops.c +1 -0
@@ -1813,6 +1813,7 @@ int ocfs2_write_begin_nolock(struct address_space *mapping,if (ret == -EAGAIN ) {BUG_ON (wc->w_target_page); ret =0 ; + *fsdata = wc; goto out_quota; }
Signature · 7 lines
2.20.1 _______________________________________________ Ocfs2-devel mailing list [email protected] https://oss.oracle.com/mailman/listinfo/ocfs2-devel
Joseph Qi
maintainerQuoted 3 lines · Dan Carpenter
The callers assume that "*fsdata" is set on the success path, but that's not necessarily true on this path.
In ocfs2_page_mkwrite(), since in this case no target page locked, it will finally return VM_FAULT_NOPAGE (better VM_FAULT_RETRY?) and throw to handle_mm_fault(). So no problem as comments described.
But things seems changed since append direct io path started to use write_[begin/end]. In this path, the target page is expected as NULL. This needs more discussion.
Thanks,
Joseph
Quoted 20 lines
Fixes 5cffff9e2986 ("ocfs2: Fix ocfs2_page_mkwrite()")Signed-off-by Dan Carpenter <[email protected]>---
Please review this one EXTRA CAREFULLY. It's from static analysis and the truth is I'm not 100% sure it's correct. I'm also not sure that it's a complete fix.Especially, please review how this is called from
ocfs2_write_begin()to make sure that this doesn't break anything.fs/ocfs2/aops.c | 1 + 1 file changed, 1 insertion(+)fs/ocfs2/aops.c +0
-0
fs/ocfs2/aops.c int ocfs2_write_begin_nolock(struct address_space *mapping, · line 1819
Quoted 7 lines
fs/ocfs2/aops.c +1
-0@@ -1813,6 +1813,7 @@ int ocfs2_write_begin_nolock(struct address_space *mapping,if (ret == -EAGAIN ) {BUG_ON (wc->w_target_page); ret =0 ; + *fsdata = wc; goto out_quota; }
_______________________________________________
Ocfs2-devel mailing list
[email protected]
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
Joseph Qi
maintainerQuoted 7 lines · Joseph Qi
Quoted 3 lines · Dan Carpenter
The callers assume that "*fsdata" is set on the success path, but that's not necessarily true on this path.
Quoted 8 lines
In
ocfs2_page_mkwrite(), since in this case no target page locked, it will finally returnVM_FAULT_NOPAGE(betterVM_FAULT_RETRY?) and throw tohandle_mm_fault(). So no problem as comments described.But things seems changed since append direct io path started to use write_[begin/end]. In this path, the target page is expected as NULL. This needs more discussion.
ocfs2_grab_pages_for_write() returns EAGAIN only in case of mmap. So current code won't have any issue.
I'll send a cleanup to make the code more clearly.
Thanks,
Joseph