---

yaml --- r: 276842 b: refs/heads/master c: 481fe17 h: refs/heads/master v: v3
git-mirror · Dec 20, 2011 · c38df4c · c38df4c
1 parent 0594e01
commit c38df4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 695c60f21c69e525a89279a5f35bae4ff237afbc
+refs/heads/master: 481fe17e973fb97aa3edf17c69557afe88d8334f
diff --git a/trunk/fs/nilfs2/ioctl.c b/trunk/fs/nilfs2/ioctl.c
@@ -625,6 +625,9 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
 		if (argv[n].v_nmembs > nsegs * nilfs->ns_blocks_per_segment)
 			goto out_free;
 
+		if (argv[n].v_nmembs >= UINT_MAX / argv[n].v_size)
+			goto out_free;
+
 		len = argv[n].v_size * argv[n].v_nmembs;
 		base = (void __user *)(unsigned long)argv[n].v_base;
 		if (len == 0) {