Re: [PATCH] use-before-uninitialized value in ext3(2)_find_ goal

[Chris Wright]

* Mingming Cao (cmm@xxxxxxxxxx) wrote:
> +	goal = 0;
>  	down(&ei->truncate_sem);
>  	if (ext3_find_goal(inode, iblock, chain, partial, &goal) < 0) {
...
> +	goal = 0;
>  	if (ext2_find_goal(inode, iblock, chain, partial, &goal) < 0)
>  		goto changed;

I know it's a slightly bigger patch, but would it make sense to just enforce
this as part of api?  Just a thought...(patch untested)

thanks,
-chris

--- linux-2.6.6-mm3/fs/ext2/inode.c~goal	2004-05-09 19:32:00.000000000 -0700
+++ linux-2.6.6-mm3/fs/ext2/inode.c	2004-05-19 12:27:11.968054560 -0700
@@ -366,6 +366,7 @@ static inline int ext2_find_goal(struct 
 				 unsigned long *goal)
 {
 	struct ext2_inode_info *ei = EXT2_I(inode);
+	unsigned long _goal = 0;
 	write_lock(&ei->i_meta_lock);
 	if (block == ei->i_next_alloc_block + 1) {
 		ei->i_next_alloc_block++;
@@ -377,10 +378,11 @@ static inline int ext2_find_goal(struct 
 		 * failing that at least try to get decent locality.
 		 */
 		if (block == ei->i_next_alloc_block)
-			*goal = ei->i_next_alloc_goal;
-		if (!*goal)
-			*goal = ext2_find_near(inode, partial);
+			_goal = ei->i_next_alloc_goal;
+		if (!_goal)
+			_goal = ext2_find_near(inode, partial);
 		write_unlock(&ei->i_meta_lock);
+		*goal = _goal;
 		return 0;
 	}
 	write_unlock(&ei->i_meta_lock);
--- linux-2.6.6-mm3/fs/ext3/inode.c~goal	2004-05-13 11:19:42.000000000 -0700
+++ linux-2.6.6-mm3/fs/ext3/inode.c	2004-05-19 12:25:48.441752488 -0700
@@ -461,6 +461,7 @@ static int ext3_find_goal(struct inode *
 			  Indirect *partial, unsigned long *goal)
 {
 	struct ext3_inode_info *ei = EXT3_I(inode);
+	unsigned long _goal = 0;
 	/* Writer: ->i_next_alloc* */
 	if (block == ei->i_next_alloc_block + 1) {
 		ei->i_next_alloc_block++;
@@ -474,9 +475,10 @@ static int ext3_find_goal(struct inode *
 		 * failing that at least try to get decent locality.
 		 */
 		if (block == ei->i_next_alloc_block)
-			*goal = ei->i_next_alloc_goal;
-		if (!*goal)
-			*goal = ext3_find_near(inode, partial);
+			_goal = ei->i_next_alloc_goal;
+		if (!_goal)
+			_goal = ext3_find_near(inode, partial);
+		*goal = _goal;
 		return 0;
 	}
 	/* Reader: end */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/