evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: kgsl: Verify the offset of the profiling buffer"

Browse source
This commit is contained in:
Linux Build Service Account 2019-09-17 15:46:45 -07:00 • committed by Gerrit - the friendly Code Review server
commit d2896f14b1
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/gpu/msm/kgsl_drawobj.c
View file

@ -614,13 +614,29 @@ static void add_profiling_buffer(struct kgsl_device *device,
return;
}
cmdobj->profiling_buf_entry = entry;
if (id != 0)
if (!id) {
cmdobj->profiling_buffer_gpuaddr = gpuaddr;
} else {
u64 off = offset + sizeof(struct kgsl_drawobj_profiling_buffer);
/*
* Make sure there is enough room in the object to store the
* entire profiling buffer object
*/
if (off < offset || off >= entry->memdesc.size) {
dev_err(device->dev,
"ignore invalid profile offset ctxt %d id %d offset %lld gpuaddr %llx size %lld\n",
drawobj->context->id, id, offset, gpuaddr, size);
kgsl_mem_entry_put(entry);
return;
}
cmdobj->profiling_buffer_gpuaddr =
entry->memdesc.gpuaddr + offset;
else
cmdobj->profiling_buffer_gpuaddr = gpuaddr;
}
cmdobj->profiling_buf_entry = entry;
}
/**