Skip to content

Commit 51520e0

Browse files
committed
EDAC/mc: Fix error path ordering in edac_mc_alloc()
When the mci->pvt_info allocation in edac_mc_alloc() fails, the error path will call put_device() which will end up calling the device's release function. However, the init ordering is wrong such that device_initialize() happens *after* the failed allocation and thus the device itself and the release function pointer are not initialized yet when they're called: MCE: In-kernel MCE decoding enabled. ------------[ cut here ]------------ kobject: '(null)': is not initialized, yet kobject_put() is being called. WARNING: lib/kobject.c:734 at kobject_put, CPU#22: systemd-udevd CPU: 22 UID: 0 PID: 538 Comm: systemd-udevd Not tainted 7.0.0-rc1+ #2 PREEMPT(full) RIP: 0010:kobject_put Call Trace: <TASK> edac_mc_alloc+0xbe/0xe0 [edac_core] amd64_edac_init+0x7a4/0xff0 [amd64_edac] ? __pfx_amd64_edac_init+0x10/0x10 [amd64_edac] do_one_initcall ... Reorder the calling sequence so that the device is initialized and thus the release function pointer is properly set before it can be used. This was found by Claude while reviewing another EDAC patch. Fixes: 0bbb265 ("EDAC/mc: Get rid of silly one-shot struct allocation in edac_mc_alloc()") Reported-by: Claude Code:claude-opus-4.5 Signed-off-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Qiuxu Zhuo <[email protected]> Cc: [email protected] Link: https://patch.msgid.link/[email protected]
1 parent 6de23f8 commit 51520e0

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/edac/edac_mc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,13 +369,13 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num,
369369
if (!mci->layers)
370370
goto error;
371371

372+
mci->dev.release = mci_release;
373+
device_initialize(&mci->dev);
374+
372375
mci->pvt_info = kzalloc(sz_pvt, GFP_KERNEL);
373376
if (!mci->pvt_info)
374377
goto error;
375378

376-
mci->dev.release = mci_release;
377-
device_initialize(&mci->dev);
378-
379379
/* setup index and various internal pointers */
380380
mci->mc_idx = mc_num;
381381
mci->tot_dimms = tot_dimms;

0 commit comments

Comments
 (0)