Commit 913e73c7 authored by Frederic Barrat's avatar Frederic Barrat Committed by Michael Ellerman

ocxl: Fix potential memory leak on context creation

If we couldn't fully init a context, we were leaking memory.

Fixes: b9721d27 ("ocxl: Allow external drivers to use OpenCAPI contexts")
Signed-off-by: default avatarFrederic Barrat <fbarrat@linux.ibm.com>
Acked-by: default avatarAndrew Donnellan <ajd@linux.ibm.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191209105513.8566-1-fbarrat@linux.ibm.com
parent 099bc481
...@@ -10,18 +10,17 @@ int ocxl_context_alloc(struct ocxl_context **context, struct ocxl_afu *afu, ...@@ -10,18 +10,17 @@ int ocxl_context_alloc(struct ocxl_context **context, struct ocxl_afu *afu,
int pasid; int pasid;
struct ocxl_context *ctx; struct ocxl_context *ctx;
*context = kzalloc(sizeof(struct ocxl_context), GFP_KERNEL); ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!*context) if (!ctx)
return -ENOMEM; return -ENOMEM;
ctx = *context;
ctx->afu = afu; ctx->afu = afu;
mutex_lock(&afu->contexts_lock); mutex_lock(&afu->contexts_lock);
pasid = idr_alloc(&afu->contexts_idr, ctx, afu->pasid_base, pasid = idr_alloc(&afu->contexts_idr, ctx, afu->pasid_base,
afu->pasid_base + afu->pasid_max, GFP_KERNEL); afu->pasid_base + afu->pasid_max, GFP_KERNEL);
if (pasid < 0) { if (pasid < 0) {
mutex_unlock(&afu->contexts_lock); mutex_unlock(&afu->contexts_lock);
kfree(ctx);
return pasid; return pasid;
} }
afu->pasid_count++; afu->pasid_count++;
...@@ -43,6 +42,7 @@ int ocxl_context_alloc(struct ocxl_context **context, struct ocxl_afu *afu, ...@@ -43,6 +42,7 @@ int ocxl_context_alloc(struct ocxl_context **context, struct ocxl_afu *afu,
* duration of the life of the context * duration of the life of the context
*/ */
ocxl_afu_get(afu); ocxl_afu_get(afu);
*context = ctx;
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ocxl_context_alloc); EXPORT_SYMBOL_GPL(ocxl_context_alloc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment