Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5506049 authored by Xi Wang's avatar Xi Wang Committed by Alex Elder
Browse files

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: default avatarXi Wang <xi.wang@gmail.com>
Reviewed-by: default avatarAlex Elder <elder@inktank.com>
parent e91a9b63
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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;