ocxl: Fix potential memory leak on context creation
Subsystems (2)
PATCH v3 1/1 ocxl: Fix potential memory leak on context creation
If we couldn't fully init a context, we were leaking memory.
Fixes b9721d275cc2 ("ocxl: Allow external drivers to use OpenCAPI contexts")
Signed-off-by Frederic Barrat <[email protected]>
---
Changlog:
v3:
code cleanup (Greg)
v2:
reset context pointer in case of allocation failure (Andrew)
drivers/misc/ocxl/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/misc/ocxl/context.c +4 -4
@@ -10,18 +10,17 @@ int ocxl_context_alloc(struct ocxl_context **context, struct ocxl_afu *afu,int pasid;struct ocxl_context *ctx; - *context =kzalloc (sizeof (struct ocxl_context ),GFP_KERNEL ); -if (!*context) + ctx =kzalloc (sizeof (*ctx),GFP_KERNEL ); +if (!ctx)return -ENOMEM ; - ctx = *context; - ctx->afu = afu;mutex_lock (&afu->contexts_lock); pasid =idr_alloc (&afu->contexts_idr, ctx, afu->pasid_base, afu->pasid_base + afu->pasid_max,GFP_KERNEL );if (pasid <0 ) {mutex_unlock (&afu->contexts_lock); +kfree (ctx);return pasid; } afu->pasid_count++;
@@ -43,6 +42,7 @@ int ocxl_context_alloc(struct ocxl_context **context, struct ocxl_afu *afu,* duration of the life of the context */ ocxl_afu_get (afu); + *context = ctx;return 0 ; }EXPORT_SYMBOL_GPL (ocxl_context_alloc);
Signature · 1 line
2.21.0
Quoted 4 lines · Frederic Barrat
If we couldn't fully init a context, we were leaking memory.
Fixes b9721d275cc2 ("ocxl: Allow external drivers to use OpenCAPI contexts")Signed-off-by Frederic Barrat <[email protected]>
Acked-by Andrew Donnellan <[email protected]>
Signature · 2 lines
Andrew Donnellan OzLabs, ADL Canberra [email protected] IBM Australia Limited
Quoted 5 lines · On Mon, 9 Dec 2019 11:55:13 +0100 Frederic Barrat <[email protected]>…
If we couldn't fully init a context, we were leaking memory.
Fixes b9721d275cc2 ("ocxl: Allow external drivers to use OpenCAPI contexts")Signed-off-by Frederic Barrat <[email protected]>---
Reviewed-by Greg Kurz <[email protected]>
Quoted 44 lines
Changlog:
v3:
code cleanup (Greg)
v2:
reset context pointer in case of allocation failure (Andrew)drivers/misc/ocxl/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/misc/ocxl/context.c +4
-4@@ -10,18 +10,17 @@ int ocxl_context_alloc(struct ocxl_context **context, struct ocxl_afu *afu,int pasid;struct ocxl_context *ctx; - *context =kzalloc (sizeof (struct ocxl_context ),GFP_KERNEL ); -if (!*context) + ctx =kzalloc (sizeof (*ctx),GFP_KERNEL ); +if (!ctx)return -ENOMEM ; - ctx = *context; - ctx->afu = afu;mutex_lock (&afu->contexts_lock); pasid =idr_alloc (&afu->contexts_idr, ctx, afu->pasid_base, afu->pasid_base + afu->pasid_max,GFP_KERNEL );if (pasid <0 ) {mutex_unlock (&afu->contexts_lock); +kfree (ctx);return pasid; } afu->pasid_count++;@@ -43,6 +42,7 @@ int ocxl_context_alloc(struct ocxl_context **context, struct ocxl_afu *afu,* duration of the life of the context */ ocxl_afu_get (afu); + *context = ctx;return 0 ; }EXPORT_SYMBOL_GPL (ocxl_context_alloc);
Michael Ellerman
AppliedQuoted 4 lines · Frederic Barrat
If we couldn't fully init a context, we were leaking memory.
Fixes b9721d275cc2 ("ocxl: Allow external drivers to use OpenCAPI contexts")Signed-off-by Frederic Barrat <[email protected]>
Applied to powerpc fixes, thanks.
https://git.kernel.org/powerpc/c/913e73c77d48aeeb50c16450a653dca9c71ae2e2
cheers