Merge pull request ceph#57353 from Svelar/asan_shec

crush/builder: free 'crush_rule' before return

Reviewed-by: Pere Diaz Bou <[email protected]>
Reviewed-by: Kefu Chai <[email protected]>

Author: tchaikov

src/crush/CrushWrapper.cc

@@ -2351,6 +2351,7 @@ int CrushWrapper::add_simple_rule_at(
   int ret = crush_add_rule(crush, rule, rno);
   if(ret < 0) {
     *err << "failed to add rule " << rno << " because " << cpp_strerror(ret);
+    free(rule);
     return ret;
   }
   set_rule_name(rno, name);
@@ -2455,6 +2456,7 @@ int CrushWrapper::add_multi_osd_per_failure_domain_rule_at(
   int ret = crush_add_rule(crush, rule, rno);
   if(ret < 0) {
     *err << "failed to add rule " << rno << " because " << cpp_strerror(ret);
+    free(rule);
     return ret;
   }
   set_rule_name(rno, name);

src/crush/CrushWrapper.h

@@ -1172,6 +1172,9 @@ class CrushWrapper {
     crush_rule *n = crush_make_rule(len, type);
     ceph_assert(n);
     ruleno = crush_add_rule(crush, n, ruleno);
+    if (ruleno < 0) {
+      free(n);
+    }
     return ruleno;
   }
   int set_rule_step(unsigned ruleno, unsigned step, int op, int arg1, int arg2) {