Skip to content

Commit 830988b

Browse files
Haoxiang Litiwai
authored andcommitted
ALSA: ac97: fix a double free in snd_ac97_controller_register()
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>
1 parent 17753d1 commit 830988b

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
@@ -298,6 +298,7 @@ static void ac97_adapter_release(struct device *dev)
298298
idr_remove(&ac97_adapter_idr, ac97_ctrl->nr);
299299
dev_dbg(&ac97_ctrl->adap, "adapter unregistered by %s\n",
300300
dev_name(ac97_ctrl->parent));
301+
kfree(ac97_ctrl);
301302
}
302303

303304
static const struct device_type ac97_adapter_type = {
@@ -319,7 +320,9 @@ static int ac97_add_adapter(struct ac97_controller *ac97_ctrl)
319320
ret = device_register(&ac97_ctrl->adap);
320321
if (ret)
321322
put_device(&ac97_ctrl->adap);
322-
}
323+
} else
324+
kfree(ac97_ctrl);
325+
323326
if (!ret) {
324327
list_add(&ac97_ctrl->controllers, &ac97_controllers);
325328
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)