libceph: Use u32 for non-negative values in ceph_monmap_decode()

This patch fixes unnecessary implicit conversions that change signedness
of blob_len and num_mon in ceph_monmap_decode().
Currently blob_len and num_mon are (signed) int variables. They are used
to hold values that are always non-negative and get assigned in
ceph_decode_32_safe(), which is meant to assign u32 values. Both
variables are subsequently used as unsigned values, and the value of
num_mon is further assigned to monmap->num_mon, which is of type u32.
Therefore, both variables should be of type u32. This is especially
relevant for num_mon. If the value read from the incoming message is
very large, it is interpreted as a negative value, and the check for
num_mon > CEPH_MAX_MON does not catch it. This leads to the attempt to
allocate a very large chunk of memory for monmap, which will most likely
fail. In this case, an unnecessary attempt to allocate memory is
performed, and -ENOMEM is returned instead of -EINVAL.

Cc: stable@vger.kernel.org
Signed-off-by: Raphael Zimmer <raphael.zimmer@tu-ilmenau.de>
Reviewed-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index 5136b3766c44de370c9b7ba6907adc69e9595de3..d5080530ce0ccb0af82d72453ddccad9673b80ff 100644 (file)
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -72,8 +72,8 @@ static struct ceph_monmap *ceph_monmap_decode(void **p, void *end, bool msgr2)
        struct ceph_monmap *monmap = NULL;
        struct ceph_fsid fsid;
        u32 struct_len;
-       int blob_len;
-       int num_mon;
+       u32 blob_len;
+       u32 num_mon;
        u8 struct_v;
        u32 epoch;
        int ret;
@@ -112,7 +112,7 @@ static struct ceph_monmap *ceph_monmap_decode(void **p, void *end, bool msgr2)
        }
        ceph_decode_32_safe(p, end, num_mon, e_inval);
 
-       dout("%s fsid %pU epoch %u num_mon %d\n", __func__, &fsid, epoch,
+       dout("%s fsid %pU epoch %u num_mon %u\n", __func__, &fsid, epoch,
             num_mon);
        if (num_mon > CEPH_MAX_MON)
                goto e_inval;