Skip to content

Commit 21f8bc5

Browse files
Haoxiang Ligregkh
authored andcommitted
ALSA: ac97: fix a double free in snd_ac97_controller_register()
[ Upstream commit 830988b6cf197e6dcffdfe2008c5738e6c6c3c0f ] If ac97_add_adapter() fails, put_device() is the correct way to drop the device reference. kfree() is not required. Add kfree() if idr_alloc() fails and in ac97_adapter_release() to do the cleanup. Found by code review. Fixes: 74426fb ("ALSA: ac97: add an ac97 bus") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn> Link: https://patch.msgid.link/20251219162845.657525-1-lihaoxiang@isrc.iscas.ac.cn Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3b7c1a3 commit 21f8bc5

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

sound/ac97/bus.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ static void ac97_adapter_release(struct device *dev)
299299
idr_remove(&ac97_adapter_idr, ac97_ctrl->nr);
300300
dev_dbg(&ac97_ctrl->adap, "adapter unregistered by %s\n",
301301
dev_name(ac97_ctrl->parent));
302+
kfree(ac97_ctrl);
302303
}
303304

304305
static const struct device_type ac97_adapter_type = {
@@ -320,7 +321,9 @@ static int ac97_add_adapter(struct ac97_controller *ac97_ctrl)
320321
ret = device_register(&ac97_ctrl->adap);
321322
if (ret)
322323
put_device(&ac97_ctrl->adap);
323-
}
324+
} else
325+
kfree(ac97_ctrl);
326+
324327
if (!ret) {
325328
list_add(&ac97_ctrl->controllers, &ac97_controllers);
326329
dev_dbg(&ac97_ctrl->adap, "adapter registered by %s\n",
@@ -361,14 +364,11 @@ struct ac97_controller *snd_ac97_controller_register(
361364
ret = ac97_add_adapter(ac97_ctrl);
362365

363366
if (ret)
364-
goto err;
367+
return ERR_PTR(ret);
365368
ac97_bus_reset(ac97_ctrl);
366369
ac97_bus_scan(ac97_ctrl);
367370

368371
return ac97_ctrl;
369-
err:
370-
kfree(ac97_ctrl);
371-
return ERR_PTR(ret);
372372
}
373373
EXPORT_SYMBOL_GPL(snd_ac97_controller_register);
374374

0 commit comments

Comments
 (0)