illumos gate

Possible fix for ilbd_hc_associate_rule leak
(file /illumos-gate/usr/src/cmd/cmd-inet/usr.lib/ilbd/ilbd_hc.c):

/* Associate a rule with its hc object. */
ilb_status_t
ilbd_hc_associate_rule(const ilbd_rule_t *rule, int ev_port)
{
    ilbd_hc_t    *hc;
    ilbd_hc_rule_t    *hc_rule;
+    ilbd_hc_rule_t    *hc_rule_next;
    ilb_status_t    ret;
    ilbd_sg_t    *sg;
    ilbd_srv_t    *ilbd_srv;

    /* The rule is assumed to be initialized appropriately. */
    if ((hc = ilbd_get_hc(rule->irl_hcname)) == NULL) {
        logdebug("ilbd_hc_associate_rule: healthcheck %s does not " 
            "exist", rule->irl_hcname);
        return (ILB_STATUS_ENOHCINFO);
    }
    if ((hc->ihc_test_type == ILBD_HC_TCP &&
        rule->irl_proto != IPPROTO_TCP) ||
        (hc->ihc_test_type == ILBD_HC_UDP &&
        rule->irl_proto != IPPROTO_UDP)) {
        return (ILB_STATUS_RULE_HC_MISMATCH);
    }
+      hc_rule_next = NULL;
+      for (hc_rule = list_head(&hc->ihc_rules); hc_rule != NULL; hc_rule = hc_rule_next) {
+           hc_rule_next = list_next(&hc->ihc_rules, hc_rule);
+           if (hc_rule->hcr_rule == rule) {
+                ilbd_hc_srv_rem_all(hc_rule);
+                list_remove(&hc->ihc_rules, hc_rule);
+                hc->ihc_rule_cnt--;
+                list_destroy(&hc_rule->hcr_servers);
+                free(hc_rule);
+           }
+      }
    if ((hc_rule = calloc(1, sizeof (ilbd_hc_rule_t))) == NULL) {
        logdebug("ilbd_hc_associate_rule: out of memory");
        return (ILB_STATUS_ENOMEM);
    }

    hc_rule->hcr_rule = rule;
    list_create(&hc_rule->hcr_servers, sizeof (ilbd_hc_srv_t),
        offsetof(ilbd_hc_srv_t, shc_srv_link));

    /* Add all the servers. */
    sg = rule->irl_sg;
    for (ilbd_srv = list_head(&sg->isg_srvlist); ilbd_srv != NULL;
        ilbd_srv = list_next(&sg->isg_srvlist, ilbd_srv)) {
        if ((ret = ilbd_hc_srv_add(hc, hc_rule, &ilbd_srv->isv_srv,
            ev_port)) != ILB_STATUS_OK) {
            /* Remove all previously added servers */
            ilbd_hc_srv_rem_all(hc_rule);
+                      list_destroy(&hc_rule->hcr_servers);
            free(hc_rule);
            return (ret);
        }
    }
    list_insert_tail(&hc->ihc_rules, hc_rule);
    hc->ihc_rule_cnt++;

    return (ILB_STATUS_OK);
}

Please post a webrev to the developer list.

Yes, I will post ASAP.

Please review webrev
http://mtc.md/sscdvp/webrevs/issue_4601/

https://github.com/sscdvp/illumos-gate/commit/599b8e46313bfe2766c3690368e86770c678eb3f

git commit 56b8f71e3a910fbd2820f6841b40bfd85f9673c2

Author: Serghei Samsi <sscdvp@gmail.com>

4601 memory leak in ILB daemon on startup
4602 memory leak in ILB daemon on import-config
4668 Memory leak in ilbd' new_req: getpeerucred() allocation isn't released at all
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Approved by: Robert Mustacchi <rm@joyent.com>