Merge branch 'v9fs-devel' of git://git.kernel.org/pub/scm/linux/kerne…

…l/git/ericvh/v9fs Pull a 9p bugfix from Eric Van Hensbergen. * 'v9fs-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: BUG before corrupting memory
goeke · Jun 18, 2012 · 67f5d06 · 67f5d06
2 parents 48d4e13 + 5fcb08b
commit 67f5d06
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
@@ -192,10 +192,10 @@ static int pack_sg_list(struct scatterlist *sg, int start,
 		s = rest_of_page(data);
 		if (s > count)
 			s = count;
+		BUG_ON(index > limit);
 		sg_set_buf(&sg[index++], data, s);
 		count -= s;
 		data += s;
-		BUG_ON(index > limit);
 	}
 
 	return index-start;