Page MenuHomeFreeBSD
Differential D45979

sound: Fix memory leak in chn_init()
ClosedPublic
Actions

Authored by christos on Jul 15 2024, 3:58 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 6, 4:10 AM
Unknown Object (File)
Sat, Mar 29, 8:04 AM
Unknown Object (File)
Fri, Mar 28, 5:31 AM
Unknown Object (File)
Mar 13 2025, 2:15 AM
Unknown Object (File)
Feb 28 2025, 11:32 PM
Unknown Object (File)
Feb 27 2025, 1:10 AM
Unknown Object (File)
Feb 26 2025, 10:50 PM
Unknown Object (File)
Feb 24 2025, 10:16 AM
View All 45 Files
Subscribers
imp

Details

Reviewers
markj
emaste
dev_submerge.ch
Commits
rG6716cc7e2768: sound: Fix memory leak in chn_init()
rG16329b7b3276: sound: Fix memory leak in chn_init()
Summary

In case chn_init() fails, we are leaking memory by not freeing the
feeder.

Sponsored by: The FreeBSD Foundation
MFC after: 2 days

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

christos created this revision.Jul 15 2024, 3:58 PM
Herald added a subscriber: imp. · View Herald TranscriptJul 15 2024, 3:58 PM
christos requested review of this revision.Jul 15 2024, 3:58 PM
Harbormaster completed remote builds in B58651: Diff 140973.Jul 15 2024, 3:58 PM
christos added a child revision: D45985: sound: Simplify chn_init().Jul 17 2024, 1:13 AM
dev_submerge.ch accepted this revision.Jul 19 2024, 12:01 AM
This revision is now accepted and ready to land.Jul 19 2024, 12:01 AM
markj accepted this revision.Jul 21 2024, 4:13 PM
markj added inline comments.
sys/dev/sound/pcm/channel.c
1369

Since this strange-looking while loop appears in several places now, it would a good idea to move it into a subroutine.

christos added inline comments.Jul 22 2024, 11:19 AM
sys/dev/sound/pcm/channel.c
1369

Maybe it's better to just modify the function directly?

markj added inline comments.Jul 22 2024, 2:02 PM
sys/dev/sound/pcm/channel.c
1369

That works too.

christos marked 2 inline comments as done.Jul 24 2024, 3:45 PM
christos added inline comments.
sys/dev/sound/pcm/channel.c
1369

@markj D46100

Closed by commit rG16329b7b3276: sound: Fix memory leak in chn_init() (authored by christos). · Explain WhyJul 27 2024, 11:58 AM
This revision was automatically updated to reflect the committed changes.
christos marked an inline comment as done.
christos added a commit: rG16329b7b3276: sound: Fix memory leak in chn_init().
christos added a commit: rG6716cc7e2768: sound: Fix memory leak in chn_init().Jul 29 2024, 3:36 PM

Revision Contents
Changeset List

PathSize
sys/
dev/
sound/
pcm/
2 lines

Diff 141462

View Options

sys/dev/sound/pcm/channel.c

Show First 20 Lines • Show All 1,644 Lines • ▼ Show 20 Linesbnxt_resume(if_ctx_t ctx)
return 0; return 0;
} }
static int static int
bnxt_priv_ioctl(if_ctx_t ctx, u_long command, caddr_t data) bnxt_priv_ioctl(if_ctx_t ctx, u_long command, caddr_t data)
{ {
struct bnxt_softc *softc = iflib_get_softc(ctx); struct bnxt_softc *softc = iflib_get_softc(ctx);
struct ifreq *ifr = (struct ifreq *)data; struct ifreq *ifr = (struct ifreq *)data;
struct ifreq_buffer *ifbuf = &ifr->ifr_ifru.ifru_buffer; struct bnxt_ioctl_header *ioh;
struct bnxt_ioctl_header *ioh = size_t iol;
(struct bnxt_ioctl_header *)(ifbuf->buffer);
int rc = ENOTSUP; int rc = ENOTSUP;
struct bnxt_ioctl_data *iod = NULL; struct bnxt_ioctl_data iod_storage, *iod = &iod_storage;
switch (command) { switch (command) {
case SIOCGPRIVATE_0: case SIOCGPRIVATE_0:
if ((rc = priv_check(curthread, PRIV_DRIVER)) != 0) if ((rc = priv_check(curthread, PRIV_DRIVER)) != 0)
goto exit; goto exit;
iod = malloc(ifbuf->length, M_DEVBUF, M_NOWAIT | M_ZERO); ioh = ifr_buffer_get_buffer(ifr);
if (!iod) { iol = ifr_buffer_get_length(ifr);
rc = ENOMEM; if (iol > sizeof(iod_storage))
return (EINVAL);
if ((rc = copyin(ioh, iod, iol)) != 0)
goto exit; goto exit;
}
copyin(ioh, iod, ifbuf->length);
switch (ioh->type) { switch (iod->hdr.type) {
case BNXT_HWRM_NVM_FIND_DIR_ENTRY: case BNXT_HWRM_NVM_FIND_DIR_ENTRY:
{ {
struct bnxt_ioctl_hwrm_nvm_find_dir_entry *find = struct bnxt_ioctl_hwrm_nvm_find_dir_entry *find =
&iod->find; &iod->find;
rc = bnxt_hwrm_nvm_find_dir_entry(softc, find->type, rc = bnxt_hwrm_nvm_find_dir_entry(softc, find->type,
&find->ordinal, find->ext, &find->index, &find->ordinal, find->ext, &find->index,
find->use_index, find->search_opt, find->use_index, find->search_opt,
&find->data_length, &find->item_length, &find->data_length, &find->item_length,
&find->fw_ver); &find->fw_ver);
if (rc) { if (rc) {
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_NVM_READ: case BNXT_HWRM_NVM_READ:
{ {
struct bnxt_ioctl_hwrm_nvm_read *rd = &iod->read; struct bnxt_ioctl_hwrm_nvm_read *rd = &iod->read;
Show All 23 Lines case BNXT_HWRM_NVM_READ:
else { else {
copyout(dma_data.idi_vaddr, copyout(dma_data.idi_vaddr,
rd->data + offset, csize); rd->data + offset, csize);
iod->hdr.rc = 0; iod->hdr.rc = 0;
} }
remain -= csize; remain -= csize;
} }
if (iod->hdr.rc == 0) if (iod->hdr.rc == 0)
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
iflib_dma_free(&dma_data); iflib_dma_free(&dma_data);
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_FW_RESET: case BNXT_HWRM_FW_RESET:
{ {
struct bnxt_ioctl_hwrm_fw_reset *rst = struct bnxt_ioctl_hwrm_fw_reset *rst =
&iod->reset; &iod->reset;
rc = bnxt_hwrm_fw_reset(softc, rst->processor, rc = bnxt_hwrm_fw_reset(softc, rst->processor,
&rst->selfreset); &rst->selfreset);
if (rc) { if (rc) {
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_FW_QSTATUS: case BNXT_HWRM_FW_QSTATUS:
{ {
struct bnxt_ioctl_hwrm_fw_qstatus *qstat = struct bnxt_ioctl_hwrm_fw_qstatus *qstat =
&iod->status; &iod->status;
rc = bnxt_hwrm_fw_qstatus(softc, qstat->processor, rc = bnxt_hwrm_fw_qstatus(softc, qstat->processor,
&qstat->selfreset); &qstat->selfreset);
if (rc) { if (rc) {
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_NVM_WRITE: case BNXT_HWRM_NVM_WRITE:
{ {
struct bnxt_ioctl_hwrm_nvm_write *wr = struct bnxt_ioctl_hwrm_nvm_write *wr =
&iod->write; &iod->write;
rc = bnxt_hwrm_nvm_write(softc, wr->data, true, rc = bnxt_hwrm_nvm_write(softc, wr->data, true,
wr->type, wr->ordinal, wr->ext, wr->attr, wr->type, wr->ordinal, wr->ext, wr->attr,
wr->option, wr->data_length, wr->keep, wr->option, wr->data_length, wr->keep,
&wr->item_length, &wr->index); &wr->item_length, &wr->index);
if (rc) { if (rc) {
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_NVM_ERASE_DIR_ENTRY: case BNXT_HWRM_NVM_ERASE_DIR_ENTRY:
{ {
struct bnxt_ioctl_hwrm_nvm_erase_dir_entry *erase = struct bnxt_ioctl_hwrm_nvm_erase_dir_entry *erase =
&iod->erase; &iod->erase;
rc = bnxt_hwrm_nvm_erase_dir_entry(softc, erase->index); rc = bnxt_hwrm_nvm_erase_dir_entry(softc, erase->index);
if (rc) { if (rc) {
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_NVM_GET_DIR_INFO: case BNXT_HWRM_NVM_GET_DIR_INFO:
{ {
struct bnxt_ioctl_hwrm_nvm_get_dir_info *info = struct bnxt_ioctl_hwrm_nvm_get_dir_info *info =
&iod->dir_info; &iod->dir_info;
rc = bnxt_hwrm_nvm_get_dir_info(softc, &info->entries, rc = bnxt_hwrm_nvm_get_dir_info(softc, &info->entries,
&info->entry_length); &info->entry_length);
if (rc) { if (rc) {
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_NVM_GET_DIR_ENTRIES: case BNXT_HWRM_NVM_GET_DIR_ENTRIES:
{ {
struct bnxt_ioctl_hwrm_nvm_get_dir_entries *get = struct bnxt_ioctl_hwrm_nvm_get_dir_entries *get =
Show All 10 Lines case BNXT_HWRM_NVM_GET_DIR_ENTRIES:
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
copyout(dma_data.idi_vaddr, get->data, copyout(dma_data.idi_vaddr, get->data,
get->entry_length * get->entries); get->entry_length * get->entries);
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
iflib_dma_free(&dma_data); iflib_dma_free(&dma_data);
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_NVM_VERIFY_UPDATE: case BNXT_HWRM_NVM_VERIFY_UPDATE:
{ {
struct bnxt_ioctl_hwrm_nvm_verify_update *vrfy = struct bnxt_ioctl_hwrm_nvm_verify_update *vrfy =
&iod->verify; &iod->verify;
rc = bnxt_hwrm_nvm_verify_update(softc, vrfy->type, rc = bnxt_hwrm_nvm_verify_update(softc, vrfy->type,
vrfy->ordinal, vrfy->ext); vrfy->ordinal, vrfy->ext);
if (rc) { if (rc) {
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_NVM_INSTALL_UPDATE: case BNXT_HWRM_NVM_INSTALL_UPDATE:
{ {
struct bnxt_ioctl_hwrm_nvm_install_update *inst = struct bnxt_ioctl_hwrm_nvm_install_update *inst =
&iod->install; &iod->install;
rc = bnxt_hwrm_nvm_install_update(softc, rc = bnxt_hwrm_nvm_install_update(softc,
inst->install_type, &inst->installed_items, inst->install_type, &inst->installed_items,
&inst->result, &inst->problem_item, &inst->result, &inst->problem_item,
&inst->reset_required); &inst->reset_required);
if (rc) { if (rc) {
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_NVM_MODIFY: case BNXT_HWRM_NVM_MODIFY:
{ {
struct bnxt_ioctl_hwrm_nvm_modify *mod = &iod->modify; struct bnxt_ioctl_hwrm_nvm_modify *mod = &iod->modify;
rc = bnxt_hwrm_nvm_modify(softc, mod->index, rc = bnxt_hwrm_nvm_modify(softc, mod->index,
mod->offset, mod->data, true, mod->length); mod->offset, mod->data, true, mod->length);
if (rc) { if (rc) {
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_FW_GET_TIME: case BNXT_HWRM_FW_GET_TIME:
{ {
struct bnxt_ioctl_hwrm_fw_get_time *gtm = struct bnxt_ioctl_hwrm_fw_get_time *gtm =
&iod->get_time; &iod->get_time;
rc = bnxt_hwrm_fw_get_time(softc, &gtm->year, rc = bnxt_hwrm_fw_get_time(softc, &gtm->year,
&gtm->month, &gtm->day, &gtm->hour, &gtm->minute, &gtm->month, &gtm->day, &gtm->hour, &gtm->minute,
&gtm->second, &gtm->millisecond, &gtm->zone); &gtm->second, &gtm->millisecond, &gtm->zone);
if (rc) { if (rc) {
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
rc = 0; rc = 0;
goto exit; goto exit;
} }
case BNXT_HWRM_FW_SET_TIME: case BNXT_HWRM_FW_SET_TIME:
{ {
struct bnxt_ioctl_hwrm_fw_set_time *stm = struct bnxt_ioctl_hwrm_fw_set_time *stm =
&iod->set_time; &iod->set_time;
rc = bnxt_hwrm_fw_set_time(softc, stm->year, rc = bnxt_hwrm_fw_set_time(softc, stm->year,
stm->month, stm->day, stm->hour, stm->minute, stm->month, stm->day, stm->hour, stm->minute,
stm->second, stm->millisecond, stm->zone); stm->second, stm->millisecond, stm->zone);
if (rc) { if (rc) {
iod->hdr.rc = rc; iod->hdr.rc = rc;
copyout(&iod->hdr.rc, &ioh->rc, copyout(&iod->hdr.rc, &ioh->rc,
sizeof(ioh->rc)); sizeof(ioh->rc));
} }
else { else {
iod->hdr.rc = 0; iod->hdr.rc = 0;
copyout(iod, ioh, ifbuf->length); copyout(iod, ioh, iol);
} }
rc = 0; rc = 0;
goto exit; goto exit;
} }
} }
break; break;
} }
exit: exit:
if (iod)
free(iod, M_DEVBUF);
return rc; return rc;
} }
/* /*
* Support functions * Support functions
*/ */
static int static int
bnxt_probe_phy(struct bnxt_softc *softc) bnxt_probe_phy(struct bnxt_softc *softc)
▲ Show 20 Lines • Show All 531 Lines • Show Last 20 Lines