From 810306a2a76eec1c232fd28ec9c351e827fa3031 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 16 May 2013 15:19:46 -0700 Subject: [PATCH] cls_rbd: make sure stripe_unit is not larger than object size Test a few other cases too. backport: cuttlefish, bobtail Signed-off-by: Josh Durgin --- src/cls/rbd/cls_rbd.cc | 2 +- src/test/cls_rbd/test_cls_rbd.cc | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc index 92349ea9304..c09f1ee604a 100644 --- a/src/cls/rbd/cls_rbd.cc +++ b/src/cls/rbd/cls_rbd.cc @@ -678,7 +678,7 @@ int set_stripe_unit_count(cls_method_context_t hctx, bufferlist *in, bufferlist CLS_ERR("failed to read the order off of disk: %s", strerror(r)); return r; } - if ((1ull << order) % stripe_unit) { + if ((1ull << order) % stripe_unit || stripe_unit > (1ull << order)) { CLS_ERR("stripe unit %llu is not a factor of the object size %llu", (unsigned long long)stripe_unit, 1ull << order); return -EINVAL; diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc index 6308980f55f..c147b43f4cb 100644 --- a/src/test/cls_rbd/test_cls_rbd.cc +++ b/src/test/cls_rbd/test_cls_rbd.cc @@ -906,6 +906,15 @@ TEST(cls_rbd, stripingv2) ASSERT_EQ(8192ull, su); ASSERT_EQ(456ull, sc); + // su must not be larger than an object + ASSERT_EQ(-EINVAL, set_stripe_unit_count(&ioctx, "bar", 1 << 23, 1)); + // su must be a factor of object size + ASSERT_EQ(-EINVAL, set_stripe_unit_count(&ioctx, "bar", 511, 1)); + // su and sc must be non-zero + ASSERT_EQ(-EINVAL, set_stripe_unit_count(&ioctx, "bar", 0, 1)); + ASSERT_EQ(-EINVAL, set_stripe_unit_count(&ioctx, "bar", 1, 0)); + ASSERT_EQ(-EINVAL, set_stripe_unit_count(&ioctx, "bar", 0, 0)); + ioctx.close(); ASSERT_EQ(0, destroy_one_pool_pp(pool_name, rados)); } -- 2.47.3