crush: assume weight_set != null imples weight_set_size > 0

Reflects ceph.git commit 5e8fa3e06b68fae1582c9230a3a8d1abc6146286.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>

2 files changed, 5 insertions, 1 deletions

diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index 746b145bfd11..417df675c71b 100644
--- a/net/ceph/crush/mapper.c
+++ b/net/ceph/crush/mapper.c
@@ -306,7 +306,7 @@ static __u32 *get_choose_arg_weights(const struct crush_bucket_straw2 *bucket,
                                      const struct crush_choose_arg *arg,
                                      int position)
 {
-        if (!arg || !arg->weight_set || arg->weight_set_size == 0)
+        if (!arg || !arg->weight_set)
                 return bucket->item_weights;
 
         if (position >= arg->weight_set_size)
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index eb57a06373ca..2586e5546143 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -295,6 +295,10 @@ static int decode_choose_args(void **p, void *end, struct crush_map *c)
                         ret = decode_choose_arg(p, end, arg);
                         if (ret)
                                 goto fail;
+
+                        if (arg->ids_size &&
+                            arg->ids_size != c->buckets[bucket_index]->size)
+                                goto e_inval;
                 }
 
                 insert_choose_arg_map(&c->choose_args, arg_map);