diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2024-02-25 19:01:18 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2024-02-25 19:01:19 -0800 |
| commit | 52eda420452ef2573b1029bca4046b22e57c7251 (patch) | |
| tree | 0b59e7859374932750f8609009d79e13846c2963 | |
| parent | 43faba9f4d76304b262239cd56d7b18dff7e73ac (diff) | |
| parent | dcc4755a0e3ed4c9884da9c105a27fe85a586ffe (diff) | |
| download | gpu-52eda420452ef2573b1029bca4046b22e57c7251.tar.gz | |
Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10
SBMerger: 605678113
Change-Id: If06ce446c9a36df7852f5263daae715e07872669
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | mali_kbase/context/mali_kbase_context.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mali_kbase/context/mali_kbase_context.c b/mali_kbase/context/mali_kbase_context.c index 42f09f3..9b8cc5d 100644 --- a/mali_kbase/context/mali_kbase_context.c +++ b/mali_kbase/context/mali_kbase_context.c @@ -46,7 +46,8 @@ static void kbase_kprcs_release(struct kobject *kobj) { - // Nothing to release + struct kbase_process *kprcs = to_kprcs(kobj); + kfree(kprcs); } static ssize_t total_gpu_mem_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) @@ -315,7 +316,8 @@ static void kbase_remove_kctx_from_process(struct kbase_context *kctx) WARN_ON(!RB_EMPTY_ROOT(&kprcs->dma_buf_root)); kobject_del(&kprcs->kobj); kobject_put(&kprcs->kobj); - kfree(kprcs); + // kfree(kprcs); -> done in kobject release callback, left here + // for easy tracking of differences from upstream. } } |