shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

video: rockchip: rve: fixup memory leak

Browse Source 
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I4d98bd853120e1ff35317595c739a942eae2c1f3
This commit is contained in:
Li Huang
2022-05-24 15:10:01 +08:00
committed by Tao Huang
parent 1bf753648b
commit 54e7d90e84
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/video/rockchip/rve/rve_job.c
View File

@@ -506,7 +506,6 @@ int rve_job_config_by_user_ctx(struct rve_user_ctx_t *user_ctx)
{ {
struct rve_pending_ctx_manager *ctx_manager; struct rve_pending_ctx_manager *ctx_manager;
struct rve_internal_ctx_t *ctx; struct rve_internal_ctx_t *ctx;
struct rve_cmd_reg_array_t *regcmd_data;
int ret = 0; int ret = 0;
unsigned long flags; unsigned long flags;
@@ -528,16 +527,19 @@ int rve_job_config_by_user_ctx(struct rve_user_ctx_t *user_ctx)
spin_unlock_irqrestore(&ctx->lock, flags); spin_unlock_irqrestore(&ctx->lock, flags);
regcmd_data = kmalloc(sizeof(struct rve_cmd_reg_array_t), GFP_KERNEL);
if (regcmd_data == NULL) {
pr_err("regcmd_data alloc error!\n");
return -ENOMEM;
}
/* TODO: user cmd_num */ /* TODO: user cmd_num */
user_ctx->cmd_num = 1; user_ctx->cmd_num = 1;
if (unlikely(copy_from_user(regcmd_data, if (ctx->regcmd_data == NULL) {
ctx->regcmd_data = kmalloc_array(user_ctx->cmd_num,
sizeof(struct rve_cmd_reg_array_t), GFP_KERNEL);
if (ctx->regcmd_data == NULL) {
pr_err("regcmd_data alloc error!\n");
return -ENOMEM;
}
}
if (unlikely(copy_from_user(ctx->regcmd_data,
u64_to_user_ptr(user_ctx->regcmd_data), u64_to_user_ptr(user_ctx->regcmd_data),
sizeof(struct rve_cmd_reg_array_t) * user_ctx->cmd_num))) { sizeof(struct rve_cmd_reg_array_t) * user_ctx->cmd_num))) {
pr_err("regcmd_data copy_from_user failed\n"); pr_err("regcmd_data copy_from_user failed\n");
@@ -548,7 +550,6 @@ int rve_job_config_by_user_ctx(struct rve_user_ctx_t *user_ctx)
ctx->sync_mode = user_ctx->sync_mode; ctx->sync_mode = user_ctx->sync_mode;
ctx->cmd_num = user_ctx->cmd_num; ctx->cmd_num = user_ctx->cmd_num;
ctx->regcmd_data = regcmd_data;
ctx->priority = user_ctx->priority; ctx->priority = user_ctx->priority;
ctx->in_fence_fd = user_ctx->in_fence_fd; ctx->in_fence_fd = user_ctx->in_fence_fd;
@@ -557,7 +558,7 @@ int rve_job_config_by_user_ctx(struct rve_user_ctx_t *user_ctx)
return ret; return ret;
err_free_regcmd_data: err_free_regcmd_data:
kfree(regcmd_data); kfree(ctx->regcmd_data);
return ret; return ret;
} }
@@ -918,6 +919,8 @@ int rve_internal_ctx_alloc_to_get_idr_id(struct rve_session *session)
idr_preload_end(); idr_preload_end();
ctx->regcmd_data = NULL;
kref_init(&ctx->refcount); kref_init(&ctx->refcount);
return ctx->id; return ctx->id;
@@ -981,9 +984,8 @@ void rve_internal_ctx_kref_release(struct kref *ref)
} }
} }
kfree(ctx->regcmd_data);
free_ctx: free_ctx:
kfree(ctx->regcmd_data);
rve_internal_ctx_free_remove_idr(ctx); rve_internal_ctx_free_remove_idr(ctx);
} }