Changeset f9597866 in mainline for uspace/drv/audio/hdaudio/hdactl.c

Timestamp:

2018-05-13T11:00:18Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

13db2044

Parents:

df96271

Message:

Avoid releasing DMA memory twice

When hda_corb_init or hda_rirb_init fail, they attempt to deallocate the
allocated DMA memory, but don't set the corb_virt or rirb_virt pointers
to NULL so that hda_ctl_init later calls hda_corb_fini and
hda_rirb_fini, where these pointers are found non-NULL and so the DMA
memory is deallocated for the second time.

File:

• uspace/drv/audio/hdaudio/hdactl.c (modified) (2 diffs)

uspace/drv/audio/hdaudio/hdactl.c

@@ -223 +223 @@
         return EOK;
 error:
-        if (hda->ctl->corb_virt != NULL)
+        if (hda->ctl->corb_virt != NULL) {
                 dmamem_unmap_anonymous(&hda->ctl->corb_virt);
+                hda->ctl->corb_virt = NULL;
+        }
         return EIO;
 }
@@ -316 +318 @@
         return EOK;
 error:
-        if (hda->ctl->rirb_virt != NULL)
+        if (hda->ctl->rirb_virt != NULL) {
                 dmamem_unmap_anonymous(&hda->ctl->rirb_virt);
+                hda->ctl->rirb_virt = NULL;
+        }
         return EIO;
 }