diff options
| author | Yang Yingliang <yangyingliang@huawei.com> | 2022-10-27 09:34:38 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-03 23:50:56 +0900 |
| commit | 802532a50acf501fdafe38a84ca2aa886d68af68 (patch) | |
| tree | cc31e56d8f50348297acce3307470f87131f441a | |
| parent | 6151e822d3abfc2ed6c4b8780d7f6af20cccb0d3 (diff) | |
| download | linux-802532a50acf501fdafe38a84ca2aa886d68af68.tar.gz linux-802532a50acf501fdafe38a84ca2aa886d68af68.tar.bz2 linux-802532a50acf501fdafe38a84ca2aa886d68af68.zip | |
ALSA: aoa: i2sbus: fix possible memory leak in i2sbus_add_dev()
[ Upstream commit 4a4c8482e370d697738a78dcd7bf2780832cb712 ]
dev_set_name() in soundbus_add_one() allocates memory for name, it need be
freed when of_device_register() fails, call soundbus_dev_put() to give up
the reference that hold in device_initialize(), so that it can be freed in
kobject_cleanup() when the refcount hit to 0. And other resources are also
freed in i2sbus_release_dev(), so it can return 0 directly.
Fixes: f3d9478b2ce4 ("[ALSA] snd-aoa: add snd-aoa")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20221027013438.991920-1-yangyingliang@huawei.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | sound/aoa/soundbus/i2sbus/core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 000b58522106..c016df586992 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -302,6 +302,10 @@ static int i2sbus_add_dev(struct macio_dev *macio, if (soundbus_add_one(&dev->sound)) { printk(KERN_DEBUG "i2sbus: device registration error!\n"); + if (dev->sound.ofdev.dev.kobj.state_initialized) { + soundbus_dev_put(&dev->sound); + return 0; + } goto err; } |