Skip to contentSkip to conversation

Fix array indexing error in rheap grow()

PATCH New Timur Tabi 1 participant 1 message Jan 27, 2007 PowerPC

lore
Share & tools
lore

Timur Tabi

author
#0 lore raw

PATCH 1/1 Fix array indexing error in rheap grow()

The grow() function in the rheap library allocates a larger array of blocks, copies the contents of the old blocks array to the newly allocated array and fixes the list_head pointers after the copy. At the end, the new blocks must be enqueued to the empty_list of the rh_info_t structure. This patch fixes a bug where the code was indexing past the end of the array when enqueueing blocks. The UCC ethernet driver, which uses the rheap allocator, experiences kernel panics because of this bug.

---
 arch/powerpc/lib/rheap.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
arch/powerpc/lib/rheap.c +2 -1
index 57bf991..4bbda6b 100644
@@ -85,7 +85,8 @@ static int grow(rh_info_t * info, int ma
 	info->flags &= ~RHIF_STATIC_BLOCK;
 
 	/* add all new blocks to the free list */
-	for (i = 0, blk = block + info->max_blocks; i < new_blocks; i++, blk++)
+	blk = block + info->max_blocks - new_blocks;
+	for (i = 0; i < new_blocks; i++, blk++)
 		list_add(&blk->list, &info->empty_list);
 
 	return 0;
Signature · 1 line
1.4.4