ocfs2: add missing return value check of ocfs2_get_clusters()
authorJoseph Qi <joseph.qi@huawei.com>
Wed, 11 Sep 2013 21:19:52 +0000 (14:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Sep 2013 22:56:44 +0000 (15:56 -0700)
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.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Reviewed-by: Jie Liu <jeff.liu@oracle.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/refcounttree.c

index a70d604593b61c0ffbce761a92b1207148f3b346..bf4dfc14bb2c7cca75b618de73bfcaf656103ff2 100644 (file)
@@ -3854,7 +3854,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,
                                                      &ref_tree->rf_ci,
@@ -4025,7 +4028,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,
                                                          ref_ci, ref_root_bh,