Commit 9464d008 authored Mar 13, 2014 by Ilya Dryomov Committed by Sage Weil Apr 04, 2014

libceph: nuke bogus encoding version check in osdmap_apply_incremental()



Only version 6 of osdmap encoding is supported, anything other than
version 6 results in an error and halts the decoding process.  Checking
if version is >= 5 is therefore bogus.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>

parent 86f1742b

net/ceph/osdmap.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -952,11 +952,10 @@ struct ceph_osdmap osdmap_apply_incremental(void p, void end,
		if (err < 0)
		goto bad;
		}
		if (version >= 5) {

		err = __decode_pool_names(p, end, map);
		if (err)
		goto bad;
		}

		/* old_pool */
		ceph_decode_32_safe(p, end, len, e_inval);