mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-02 22:54:52 +00:00
ctld: plug memory leaks
Reviewed by: mav
Sponsored by: Axcient
Reported by: valgrind
Pull Request: https://github.com/freebsd/freebsd-src/pull/1288
(cherry picked from commit 2909ddd17c
)
This commit is contained in:
parent
7a8bab3d94
commit
5d5082fd98
|
@ -2874,6 +2874,7 @@ main(int argc, char **argv)
|
|||
error = conf_apply(oldconf, newconf);
|
||||
if (error != 0)
|
||||
log_warnx("failed to apply configuration");
|
||||
conf_delete(newconf);
|
||||
conf_delete(oldconf);
|
||||
oldconf = NULL;
|
||||
|
||||
|
|
|
@ -615,6 +615,22 @@ conf_new_from_kernel(void)
|
|||
}
|
||||
cp->p_ctl_port = port->port_id;
|
||||
}
|
||||
while ((port = STAILQ_FIRST(&devlist.port_list))) {
|
||||
struct cctl_lun_nv *nv;
|
||||
|
||||
STAILQ_REMOVE_HEAD(&devlist.port_list, links);
|
||||
free(port->port_frontend);
|
||||
free(port->port_name);
|
||||
free(port->cfiscsi_target);
|
||||
free(port->ctld_portal_group_name);
|
||||
while ((nv = STAILQ_FIRST(&port->attr_list))) {
|
||||
STAILQ_REMOVE_HEAD(&port->attr_list, links);
|
||||
free(nv->value);
|
||||
free(nv->name);
|
||||
free(nv);
|
||||
}
|
||||
free(port);
|
||||
}
|
||||
free(name);
|
||||
|
||||
STAILQ_FOREACH(lun, &devlist.lun_list, links) {
|
||||
|
@ -665,6 +681,18 @@ conf_new_from_kernel(void)
|
|||
cl->l_name);
|
||||
}
|
||||
}
|
||||
while ((lun = STAILQ_FIRST(&devlist.lun_list))) {
|
||||
struct cctl_lun_nv *nv;
|
||||
|
||||
STAILQ_REMOVE_HEAD(&devlist.lun_list, links);
|
||||
while ((nv = STAILQ_FIRST(&lun->attr_list))) {
|
||||
STAILQ_REMOVE_HEAD(&lun->attr_list, links);
|
||||
free(nv->value);
|
||||
free(nv->name);
|
||||
free(nv);
|
||||
}
|
||||
free(lun);
|
||||
}
|
||||
|
||||
return (conf);
|
||||
}
|
||||
|
@ -742,12 +770,14 @@ kernel_lun_add(struct lun *lun)
|
|||
|
||||
req.args = nvlist_pack(req.args_nvl, &req.args_len);
|
||||
if (req.args == NULL) {
|
||||
nvlist_destroy(req.args_nvl);
|
||||
log_warn("error packing nvlist");
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
|
||||
error = ioctl(ctl_fd, CTL_LUN_REQ, &req);
|
||||
free(req.args);
|
||||
nvlist_destroy(req.args_nvl);
|
||||
|
||||
if (error != 0) {
|
||||
|
@ -825,12 +855,14 @@ kernel_lun_modify(struct lun *lun)
|
|||
|
||||
req.args = nvlist_pack(req.args_nvl, &req.args_len);
|
||||
if (req.args == NULL) {
|
||||
nvlist_destroy(req.args_nvl);
|
||||
log_warn("error packing nvlist");
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
|
||||
error = ioctl(ctl_fd, CTL_LUN_REQ, &req);
|
||||
free(req.args);
|
||||
nvlist_destroy(req.args_nvl);
|
||||
|
||||
if (error != 0) {
|
||||
|
@ -1053,6 +1085,7 @@ kernel_port_add(struct port *port)
|
|||
|
||||
req.args = nvlist_pack(req.args_nvl, &req.args_len);
|
||||
if (req.args == NULL) {
|
||||
nvlist_destroy(req.args_nvl);
|
||||
log_warn("error packing nvlist");
|
||||
return (1);
|
||||
}
|
||||
|
@ -1060,6 +1093,7 @@ kernel_port_add(struct port *port)
|
|||
req.result = result_buf;
|
||||
req.result_len = sizeof(result_buf);
|
||||
error = ioctl(ctl_fd, CTL_PORT_REQ, &req);
|
||||
free(req.args);
|
||||
nvlist_destroy(req.args_nvl);
|
||||
|
||||
if (error != 0) {
|
||||
|
@ -1203,11 +1237,13 @@ kernel_port_remove(struct port *port)
|
|||
|
||||
req.args = nvlist_pack(req.args_nvl, &req.args_len);
|
||||
if (req.args == NULL) {
|
||||
nvlist_destroy(req.args_nvl);
|
||||
log_warn("error packing nvlist");
|
||||
return (1);
|
||||
}
|
||||
|
||||
error = ioctl(ctl_fd, CTL_PORT_REQ, &req);
|
||||
free(req.args);
|
||||
nvlist_destroy(req.args_nvl);
|
||||
|
||||
if (error != 0) {
|
||||
|
|
Loading…
Reference in a new issue