aboutsummaryrefslogtreecommitdiff
path: root/net/ceph/osdmap.c
diff options
context:
space:
mode:
authorXi Wang <xi.wang@gmail.com>2012-06-06 19:35:55 -0500
committerAlex Elder <elder@dreamhost.com>2012-06-07 08:28:16 -0500
commita5506049500b30dbc5edb4d07a3577477c1f3643 (patch)
treee0229258f8f389c790f29af687cf5c13911c9bf3 /net/ceph/osdmap.c
parente91a9b639a691e0982088b5954eaafb5a25c8f1c (diff)
downloadlinux-a5506049500b30dbc5edb4d07a3577477c1f3643.tar.gz
libceph: fix overflow in osdmap_apply_incremental()
On 32-bit systems, a large `pglen' would overflow `pglen*sizeof(u32)' and bypass the check ceph_decode_need(p, end, pglen*sizeof(u32), bad). It would also overflow the subsequent kmalloc() size, leading to out-of-bounds write. Signed-off-by: Xi Wang <xi.wang@gmail.com> Reviewed-by: Alex Elder <elder@inktank.com>
Diffstat (limited to 'net/ceph/osdmap.c')
-rw-r--r--net/ceph/osdmap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index d70aaca4a45..d3de09f519b 100644
--- a/net/ceph/osdmap.c
+++ b/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;