]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
PM: EM: Fix memory leak in em_create_pd() error path
authorMalaya Kumar Rout <mrout@redhat.com>
Mon, 5 Jan 2026 10:37:29 +0000 (16:07 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 8 Jan 2026 15:55:21 +0000 (16:55 +0100)
When ida_alloc() fails in em_create_pd(), the function returns without
freeing the previously allocated 'pd' structure, leading to a memory leak.
The 'pd' pointer is allocated either at line 436 (for CPU devices with
cpumask) or line 442 (for other devices) using kzalloc().

Additionally, the function incorrectly returns -ENOMEM when ida_alloc()
fails, ignoring the actual error code returned by ida_alloc(), which can
fail for reasons other than memory exhaustion.

Fix both issues by:
 1. Freeing the 'pd' structure with kfree() when ida_alloc() fails
 2. Returning the actual error code from ida_alloc() instead of -ENOMEM

This ensures proper cleanup on the error path and accurate error reporting.

Fixes: cbe5aeedecc7 ("PM: EM: Assign a unique ID when creating a performance domain")
Signed-off-by: Malaya Kumar Rout <mrout@redhat.com>
Reviewed-by: Changwoo Min <changwoo@igalia.com>
Link: https://patch.msgid.link/20260105103730.65626-1-mrout@redhat.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
kernel/power/energy_model.c

index 11af9f64aa8276e47e0a5b2d615b227368af5480..5b055cbe5341e4bb4ce95d888eb4036c23d44bc1 100644 (file)
@@ -449,8 +449,10 @@ static int em_create_pd(struct device *dev, int nr_states,
        INIT_LIST_HEAD(&pd->node);
 
        id = ida_alloc(&em_pd_ida, GFP_KERNEL);
-       if (id < 0)
-               return -ENOMEM;
+       if (id < 0) {
+               kfree(pd);
+               return id;
+       }
        pd->id = id;
 
        em_table = em_table_alloc(pd);