[v1] audio: Free consumed default audio devices

[PATCH] audio: Free consumed default audio devices

Akihiko Odaki posted 1 patch 1 year ago

Diff against v2
Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20231119083940.20558-1-akihiko.odaki@daynix.com

Maintainers: Gerd Hoffmann <kraxel@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>

There is a newer version of this series

audio/audio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Expand all Fold all

[PATCH] audio: Free consumed default audio devices

Posted by Akihiko Odaki 1 year ago

Failed default audio devices were removed from the list but not freed,
and that made LeakSanitizer sad. Free default audio devices as they are
consumed.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
 audio/audio.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/audio/audio.c b/audio/audio.c
index f91e05b72c..becf6cdf46 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1758,12 +1758,14 @@ static AudioState *audio_init(Audiodev *dev, Error **errp)
                 goto out;
             }
             s->dev = dev = e->dev;
+            QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next);
+            g_free(e);
             drvname = AudiodevDriver_str(dev->driver);
             driver = audio_driver_lookup(drvname);
             if (!audio_driver_init(s, driver, dev, NULL)) {
                 break;
             }
-            QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next);
+            qapi_free_Audiodev(dev);
         }
     }
 
-- 
2.42.1

Re: [PATCH] audio: Free consumed default audio devices

Posted by Marc-André Lureau 1 year ago

Hi

On Sun, Nov 19, 2023 at 12:40 PM Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
>
> Failed default audio devices were removed from the list but not freed,
> and that made LeakSanitizer sad. Free default audio devices as they are
> consumed.
>
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> ---
>  audio/audio.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/audio/audio.c b/audio/audio.c
> index f91e05b72c..becf6cdf46 100644
> --- a/audio/audio.c
> +++ b/audio/audio.c
> @@ -1758,12 +1758,14 @@ static AudioState *audio_init(Audiodev *dev, Error **errp)
>                  goto out;
>              }
>              s->dev = dev = e->dev;
> +            QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next);
> +            g_free(e);
>              drvname = AudiodevDriver_str(dev->driver);
>              driver = audio_driver_lookup(drvname);
>              if (!audio_driver_init(s, driver, dev, NULL)) {
>                  break;
>              }
> -            QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next);
> +            qapi_free_Audiodev(dev);

I'd set s->dev to NULL, to avoid potential dangling pointers.

(it looks like like this could already hit a double-free on error path)

>          }
>      }
>
> --
> 2.42.1
>