xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "media: ti: cal: fix possible memory leak in cal_ctx_create()"

Browse Source 
This reverts commit c7a218cbf6.

The memory of ctx is allocated by devm_kzalloc in cal_ctx_create,
it should not be freed by kfree when cal_ctx_v4l2_init() fails,
otherwise kfree() will cause double free, so revert this patch.

The memory of ctx is allocated by kzalloc since commit
9e67f24e4d9 ("media: ti-vpe: cal: fix ctx uninitialization"),
so the fixes tag of patch c7a218cbf67fis not entirely accurate,
mainline should merge this patch, but it should not be merged
into 5.10, so we just revert this patch for this branch.

Fixes: c7a218cbf6 ("media: ti: cal: fix possible memory leak in cal_ctx_create()")
Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gaosheng Cui
2023-04-04 09:25:02 +08:00
committed by Greg Kroah-Hartman
parent 2d96c8dca9
commit a412ba6b6c
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/ti-vpe/cal.c
View File

@@ -624,10 +624,8 @@ static struct cal_ctx *cal_ctx_create(struct cal_dev *cal, int inst)
ctx->cport = inst; ctx->cport = inst;
ret = cal_ctx_v4l2_init(ctx); ret = cal_ctx_v4l2_init(ctx);
if (ret) { if (ret)
kfree(ctx);
return NULL; return NULL;
}
return ctx; return ctx;
} }