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

spcom: fix lock ION buffer

Browse source 
Check if ION buffer is locked based on comparing the kernel ion handle,
rather than comparing the user file descriptor.

Change-Id: I7a41df3eebf22de2cc6b14327978923bcdbb7142
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
This commit is contained in:
Amir Samuelov 2016-05-31 10:13:26 +03:00 • committed by Kyle Yan
parent 62a5a6aa32
commit d8b33a2dac
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/soc/qcom/spcom.c
View file

@ -1520,12 +1520,6 @@ static int spcom_handle_lock_ion_buf_command(struct spcom_channel *ch,
return -ENODEV;
}
/* Check if this FD is already locked */
for (i = 0 ; i < SPCOM_MAX_ION_BUF ; i++)
if (ch->ion_fd_table[i] == fd) {
pr_debug("fd [%d] is already locked.\n", fd);
return -EINVAL;
}
/* Get ION handle from fd - this increments the ref count */
ion_handle = ion_import_dma_buf(spcom_dev->ion_client, fd);
@ -1535,6 +1529,17 @@ static int spcom_handle_lock_ion_buf_command(struct spcom_channel *ch,
}
pr_debug("ion handle ok.\n");
/* Check if this ION buffer is already locked */
for (i = 0 ; i < SPCOM_MAX_ION_BUF ; i++) {
if (ch->ion_handle_table[i] == ion_handle) {
pr_debug("fd [%d] ion buf is already locked.\n", fd);
/* decrement back the ref count */
ion_free(spcom_dev->ion_client, ion_handle);
return -EINVAL;
}
}
/* Store the ION handle */
for (i = 0 ; i < SPCOM_MAX_ION_BUF ; i++) {
if (ch->ion_handle_table[i] == NULL) {
ch->ion_handle_table[i] = ion_handle;