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

Merge "msm: kgsl: Fix kgsl memory allocation and free race condition"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-14 07:28:51 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0e17c8db46
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/gpu/msm/kgsl.c
View file

@ -260,9 +260,12 @@ kgsl_mem_entry_create(void)
{
struct kgsl_mem_entry *entry = kzalloc(sizeof(*entry), GFP_KERNEL);
if (entry != NULL)
if (entry != NULL) {
kref_init(&entry->refcount);
/* put this ref in the caller functions after init */
kref_get(&entry->refcount);
}
return entry;
}
#ifdef CONFIG_DMA_SHARED_BUFFER
@ -2399,6 +2402,9 @@ long kgsl_ioctl_gpuobj_import(struct kgsl_device_private *dev_priv,
trace_kgsl_mem_map(entry, fd);
kgsl_mem_entry_commit_process(entry);
/* put the extra refcount for kgsl_mem_entry_create() */
kgsl_mem_entry_put(entry);
return 0;
unmap:
@ -2705,6 +2711,9 @@ long kgsl_ioctl_map_user_mem(struct kgsl_device_private *dev_priv,
trace_kgsl_mem_map(entry, param->fd);
kgsl_mem_entry_commit_process(entry);
/* put the extra refcount for kgsl_mem_entry_create() */
kgsl_mem_entry_put(entry);
return result;
error_attach:
@ -3143,6 +3152,9 @@ long kgsl_ioctl_gpuobj_alloc(struct kgsl_device_private *dev_priv,
param->mmapsize = kgsl_memdesc_footprint(&entry->memdesc);
param->id = entry->id;
/* put the extra refcount for kgsl_mem_entry_create() */
kgsl_mem_entry_put(entry);
return 0;
}
@ -3166,6 +3178,9 @@ long kgsl_ioctl_gpumem_alloc(struct kgsl_device_private *dev_priv,
param->size = (size_t) entry->memdesc.size;
param->flags = (unsigned int) entry->memdesc.flags;
/* put the extra refcount for kgsl_mem_entry_create() */
kgsl_mem_entry_put(entry);
return 0;
}
@ -3189,6 +3204,9 @@ long kgsl_ioctl_gpumem_alloc_id(struct kgsl_device_private *dev_priv,
param->mmapsize = (size_t) kgsl_memdesc_footprint(&entry->memdesc);
param->gpuaddr = (unsigned long) entry->memdesc.gpuaddr;
/* put the extra refcount for kgsl_mem_entry_create() */
kgsl_mem_entry_put(entry);
return 0;
}
@ -3306,6 +3324,9 @@ long kgsl_ioctl_sparse_phys_alloc(struct kgsl_device_private *dev_priv,
trace_sparse_phys_alloc(entry->id, param->size, param->pagesize);
kgsl_mem_entry_commit_process(entry);
/* put the extra refcount for kgsl_mem_entry_create() */
kgsl_mem_entry_put(entry);
return 0;
err_invalid_pages:
@ -3385,6 +3406,9 @@ long kgsl_ioctl_sparse_virt_alloc(struct kgsl_device_private *dev_priv,
trace_sparse_virt_alloc(entry->id, param->size, param->pagesize);
kgsl_mem_entry_commit_process(entry);
/* put the extra refcount for kgsl_mem_entry_create() */
kgsl_mem_entry_put(entry);
return 0;
}