ocfs2: add the missing return value check of ocfs2_get_clusters
PATCH 1/1 ocfs2: add the missing return value check of ocfs2_get_clusters
In ocfs2_attach_refcount_tree() and ocfs2_duplicate_extent_list(), if error occurs when calling ocfs2_get_clusters(), it will go with unexpected behavior as local variables p_cluster, num_clusters and ext_flags are declared without initialization.
--- fs/ocfs2/refcounttree.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/ocfs2/refcounttree.c +0 -0
@@ -3886,6 +3886,10 @@ static int ocfs2_attach_refcount_tree(struct
inode *inode,
while (cpos < clusters) {
ret = ocfs2_get_clusters(inode, cpos, &p_cluster,
&num_clusters, &ext_flags);
+ if (ret) {
+ mlog_errno(ret);
+ goto unlock;
+ }
if (p_cluster && !(ext_flags & OCFS2_EXT_REFCOUNTED)) {
ret = ocfs2_add_refcount_flag(inode, &di_et,
@@ -4057,6 +4061,10 @@ static int ocfs2_duplicate_extent_list(struct inode *s_inode,
while (cpos < clusters) {
ret = ocfs2_get_clusters(s_inode, cpos, &p_cluster,
&num_clusters, &ext_flags);
+ if (ret) {
+ mlog_errno(ret);
+ goto out;
+ }
if (p_cluster) {
ret = ocfs2_add_refcounted_extent(t_inode, &et,
Signature · 1 line
1.7.9.7
PATCH 1/1 ocfs2: add the missing return value check of ocfs2_get_clusters
Quoted 15 lines · Joseph Qi
In
ocfs2_attach_refcount_tree()andocfs2_duplicate_extent_list(), if error occurs when callingocfs2_get_clusters(), it will go with unexpected behavior as local variablesp_cluster,num_clustersandext_flagsare declared without initialization.Signed-off-by Joseph Qi <[email protected]>--- fs/ocfs2/refcounttree.c | 8 ++++++++ 1 file changed, 8 insertions(+)fs/ocfs2/refcounttree.c +0
-0
fs/ocfs2/refcounttree.c static int ocfs2_attach_refcount_tree(struct · line 3886
Quoted 1 line
fs/ocfs2/refcounttree.c +0
-0@@ -3886,6 +3886,10 @@ static int ocfs2_attach_refcount_tree(struct inode *inode,
Line wrapped?
Quoted 22 lines
fs/ocfs2/refcounttree.c +4
-0while (cpos < clusters) { ret =ocfs2_get_clusters (inode, cpos, &p_cluster, &num_clusters, &ext_flags); +if (ret) { +mlog_errno (ret); + goto unlock; + }if (p_cluster && !(ext_flags &OCFS2_EXT_REFCOUNTED )) {fs/ocfs2/refcounttree.c +4
-0ret = ocfs2_add_refcount_flag(inode, &di_et,@@ -4057,6 +4061,10 @@ static int ocfs2_duplicate_extent_list(struct inode *s_inode, while (cpos < clusters) { ret =ocfs2_get_clusters (s_inode, cpos, &p_cluster, &num_clusters, &ext_flags); +if (ret) { +mlog_errno (ret); + goto out; + }if (p_cluster) {ret = ocfs2_add_refcounted_extent(t_inode, &et,
PATCH 1/1 ocfs2: add the missing return value check of ocfs2_get_clusters
Quoted 41 lines · Jeff Liu
Quoted 15 lines · Joseph Qi
In
ocfs2_attach_refcount_tree()andocfs2_duplicate_extent_list(), if error occurs when callingocfs2_get_clusters(), it will go with unexpected behavior as local variablesp_cluster,num_clustersandext_flagsare declared without initialization.Signed-off-by Joseph Qi <[email protected]>--- fs/ocfs2/refcounttree.c | 8 ++++++++ 1 file changed, 8 insertions(+)fs/ocfs2/refcounttree.c +0
-0fs/ocfs2/refcounttree.c static int ocfs2_attach_refcount_tree(struct · line 3886
Quoted 1 line
fs/ocfs2/refcounttree.c +0
-0@@ -3886,6 +3886,10 @@ static int ocfs2_attach_refcount_tree(struct inode *inode,Line wrapped?
Quoted 20 lines
fs/ocfs2/refcounttree.c +4
-0while (cpos < clusters) { ret =ocfs2_get_clusters (inode, cpos, &p_cluster, &num_clusters, &ext_flags); +if (ret) { +mlog_errno (ret); + goto unlock; + }if (p_cluster && !(ext_flags &OCFS2_EXT_REFCOUNTED )) {fs/ocfs2/refcounttree.c +4
-0ret = ocfs2_add_refcount_flag(inode, &di_et,@@ -4057,6 +4061,10 @@ static int ocfs2_duplicate_extent_list(struct inode *s_inode, while (cpos < clusters) { ret =ocfs2_get_clusters (s_inode, cpos, &p_cluster, &num_clusters, &ext_flags); +if (ret) { +mlog_errno (ret); + goto out; + }
Quoted 5 lines
Quoted 2 lines
fs/ocfs2/refcounttree.c +0
-0if (p_cluster) {ret = ocfs2_add_refcounted_extent(t_inode, &et,
Sorry, I will resend it.