Merge "msm: kgsl: Prevent race condition when freeing memory" (5553c6cb) · Commits · e / devices / android_kernel_sony_msm8998

drivers/gpu/msm/kgsl.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -3356,7 +3356,13 @@ long kgsl_ioctl_sparse_phys_free(struct kgsl_device_private *dev_priv,
		if (entry == NULL)
		return -EINVAL;

		if (!kgsl_mem_entry_set_pend(entry)) {
		kgsl_mem_entry_put(entry);
		return -EBUSY;
		}

		if (entry->memdesc.cur_bindings != 0) {
		kgsl_mem_entry_unset_pend(entry);
		kgsl_mem_entry_put(entry);
		return -EINVAL;
		}
		@@ -3425,7 +3431,13 @@ long kgsl_ioctl_sparse_virt_free(struct kgsl_device_private *dev_priv,
		if (entry == NULL)
		return -EINVAL;

		if (!kgsl_mem_entry_set_pend(entry)) {
		kgsl_mem_entry_put(entry);
		return -EBUSY;
		}

		if (entry->bind_tree.rb_node != NULL) {
		kgsl_mem_entry_unset_pend(entry);
		kgsl_mem_entry_put(entry);
		return -EINVAL;
		}