---

yaml --- r: 320278 b: refs/heads/master c: a550604 h: refs/heads/master v: v3
git-mirror · Jun 7, 2012 · 629515f · 629515f
1 parent a1830db
commit 629515f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e91a9b639a691e0982088b5954eaafb5a25c8f1c
+refs/heads/master: a5506049500b30dbc5edb4d07a3577477c1f3643
diff --git a/trunk/net/ceph/osdmap.c b/trunk/net/ceph/osdmap.c
@@ -893,6 +893,10 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
 			(void) __remove_pg_mapping(&map->pg_temp, pgid);
 
 			/* insert */
+			if (pglen > (UINT_MAX - sizeof(*pg)) / sizeof(u32)) {
+				err = -EINVAL;
+				goto bad;
+			}
 			pg = kmalloc(sizeof(*pg) + sizeof(u32)*pglen, GFP_NOFS);
 			if (!pg) {
 				err = -ENOMEM;