ocfs2: fix possible double free in ocfs2_write_begin_nolock
PATCH 1/1 ocfs2: fix possible double free in ocfs2_write_begin_nolock
When ocfs2_write_cluster_by_desc() failed in ocfs2_write_begin_nolock() because of ENOSPC, it goes to out_quota, freeing data_ac(meta_ac). Then it calls ocfs2_try_to_free_truncate_log() to free space. If enough space freed, it will try to write again. Unfortunately, some error happenes before ocfs2_lock_allocators(), it goes to out and free data_ac(meta_ac) again.
--- fs/ocfs2/aops.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/ocfs2/aops.c +6 -2
@@ -1897,10 +1897,14 @@ out_commit: out:ocfs2_free_write_ctxt (wc); -if (data_ac) +if (data_ac) {ocfs2_free_alloc_context (data_ac); -if (meta_ac) + data_ac =NULL ; + } +if (meta_ac) {ocfs2_free_alloc_context (meta_ac); + meta_ac =NULL ; + }if (ret == -ENOSPC && try_free) {/*
Signature · 1 line
1.7.9.7
PATCH 1/1 ocfs2: fix possible double free in ocfs2_write_begin_nolock
Quoted 6 lines · Xue jiufei
When
ocfs2_write_cluster_by_desc()failed inocfs2_write_begin_nolock()because of ENOSPC, it goes toout_quota, freeingdata_ac(meta_ac). Then it callsocfs2_try_to_free_truncate_log()to free space. If enough space freed, it will try to write again. Unfortunately, some error happenes beforeocfs2_lock_allocators(), it goes to out and freedata_ac(meta_ac)again.
Looks good to me, thanks.
Quoted 27 lines
Signed-off-by joyce <[email protected]>--- fs/ocfs2/aops.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/ocfs2/aops.c +6
-2@@ -1897,10 +1897,14 @@ out_commit: out:ocfs2_free_write_ctxt (wc); -if (data_ac) +if (data_ac) {ocfs2_free_alloc_context (data_ac); -if (meta_ac) + data_ac =NULL ; + } +if (meta_ac) {ocfs2_free_alloc_context (meta_ac); + meta_ac =NULL ; + }if (ret == -ENOSPC && try_free) {/*
Joel Becker
maintainerPATCH 1/1 ocfs2: fix possible double free in ocfs2_write_begin_nolock
In reply to Xue jiufeiQuoted 8 lines · Xue jiufei
When
ocfs2_write_cluster_by_desc()failed inocfs2_write_begin_nolock()because of ENOSPC, it goes toout_quota, freeingdata_ac(meta_ac). Then it callsocfs2_try_to_free_truncate_log()to free space. If enough space freed, it will try to write again. Unfortunately, some error happenes beforeocfs2_lock_allocators(), it goes to out and freedata_ac(meta_ac)again.Signed-off-by joyce <[email protected]>
Good catch. This function could use some refactoring for understandability.
Quoted 33 lines
--- fs/ocfs2/aops.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)fs/ocfs2/aops.c +6
-2@@ -1897,10 +1897,14 @@ out_commit: out:ocfs2_free_write_ctxt (wc); -if (data_ac) +if (data_ac) {ocfs2_free_alloc_context (data_ac); -if (meta_ac) + data_ac =NULL ; + } +if (meta_ac) {ocfs2_free_alloc_context (meta_ac); + meta_ac =NULL ; + }if (ret == -ENOSPC && try_free) {/* Signature · 7 lines
1.7.9.7 _______________________________________________ Ocfs2-devel mailing list Ocfs2-devel at oss.oracle.com https://oss.oracle.com/mailman/listinfo/ocfs2-devel
Signature · 7 lines
Life's Little Instruction Book #464 "Don't miss the magic of the moment by focusing on what's to come." http://www.jlbec.org/ jlbec at evilplan.org