Skip to contentSkip to conversation

xfs_repair: Fix malloc size of rt_ext_tree_ptr (harmless)

PATCH New Eric Sandeen 2 participants 2 messages Aug 1, 2015 – Aug 2, 2015

lore
Share & tools
lore

Eric Sandeen

author
#0 lore raw

rt_ext_tree_ptr points to an avl64tree_desc_t, but we malloc memory according to the size of avltree_desc_t. Oddly, the latter happens to be larger, so we're ok, but may as well make it correct.

Addresses-Coverity-Id: 1297533

Signed-off-by Eric Sandeen <[email protected]>

---

Hm, I thought I sent this already, but don't see it on the list.

repair/incore_ext.c +1 -1
index 826bf44..6611d5c 100644
@@ -783,7 +783,7 @@ incore_ext_init(xfs_mount_t *mp)
 		avl_init_tree(extent_bcnt_ptrs[i], &avl_extent_bcnt_tree_ops);
 	}
 
-	if ((rt_ext_tree_ptr = malloc(sizeof(avltree_desc_t))) == NULL)
+	if ((rt_ext_tree_ptr = malloc(sizeof(avl64tree_desc_t))) == NULL)
 		do_error(_("couldn't malloc dup rt extent tree descriptor\n"));
 
 	avl64_init_tree(rt_ext_tree_ptr, &avl64_extent_tree_ops);

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#1 lore raw

PATCH 1/1 xfs_repair: Fix malloc size of rt_ext_tree_ptr (harmless)

rt_ext_tree_ptr points to an avl64tree_desc_t, but we malloc memory according to the size of avltree_desc_t. Oddly, the latter happens to be larger, so we're ok, but may as well make it correct.

Addresses-Coverity-Id: 1297533

Signed-off-by Eric Sandeen <[email protected]>

---

(sorry, missed [PATCH] on the first one, durrr...)
Hm, I thought I sent this already, but don't see it on the list.

repair/incore_ext.c +1 -1
index 826bf44..6611d5c 100644
@@ -783,7 +783,7 @@ incore_ext_init(xfs_mount_t *mp)
 		avl_init_tree(extent_bcnt_ptrs[i], &avl_extent_bcnt_tree_ops);
 	}
 
-	if ((rt_ext_tree_ptr = malloc(sizeof(avltree_desc_t))) == NULL)
+	if ((rt_ext_tree_ptr = malloc(sizeof(avl64tree_desc_t))) == NULL)
 		do_error(_("couldn't malloc dup rt extent tree descriptor\n"));
 
 	avl64_init_tree(rt_ext_tree_ptr, &avl64_extent_tree_ops);

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs