rubenslte/android_kernel_samsung_msm8226
1
Fork 1
mirror of https://github.com/LineageOS/android_kernel_samsung_msm8226.git synced 2026-09-29 00:00:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ASoC: msm: qdsp6v2: Avoid double free of hw_delay structure"

Browse Source
This commit is contained in:
Linux Build Service Account
2013-10-11 15:15:43 -07:00
committed by Gerrit - the friendly Code Review server
parent 96a98335a0 fe477c1a38
commit a2f617203b
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/soc/msm/qdsp6v2/audio_acdb.c
+14 -12
View File
@@ -401,7 +401,7 @@ int get_hw_delay(int32_t path, struct hw_delay_entry *entry)
delay = &acdb_data.hw_delay_tx;
if ((delay == NULL) || ((delay != NULL) && delay->num_entries == 0)) {
pr_err("ACDB=> %s Invalid delay/ delay entries\n", __func__);
pr_debug("ACDB=> %s Invalid delay/ delay entries\n", __func__);
result = -EINVAL;
goto done;
}
@@ -455,7 +455,7 @@ int store_hw_delay(int32_t path, void *arg)
}
if ((delay.num_entries <= 0) ||
(delay.num_entries > MAX_HW_DELAY_ENTRIES)) {
pr_err("ACDB=> %s incorrect no of hw delay entries: %d\n",
pr_debug("ACDB=> %s incorrect no of hw delay entries: %d\n",
__func__, delay.num_entries);
result = -EINVAL;
goto done;
@@ -1120,8 +1120,12 @@ static int acdb_open(struct inode *inode, struct file *f)
atomic_set(&acdb_data.valid_asm_custom_top, 1);
atomic_inc(&usage_count);
return result;
}
static void allocate_hw_delay_entries(void)
{
/* Allocate memory for hw delay entries */
mutex_lock(&acdb_data.acdb_mutex);
acdb_data.hw_delay_rx.num_entries = 0;
acdb_data.hw_delay_tx.num_entries = 0;
acdb_data.hw_delay_rx.delay_info =
@@ -1140,9 +1144,6 @@ static int acdb_open(struct inode *inode, struct file *f)
pr_err("%s : Failed to allocate av sync delay entries tx\n",
__func__);
}
mutex_unlock(&acdb_data.acdb_mutex);
return result;
}
static int unmap_cal_tables(void)
@@ -1194,15 +1195,17 @@ static int deregister_memory(void)
int i;
pr_debug("%s\n", __func__);
mutex_lock(&acdb_data.acdb_mutex);
kfree(acdb_data.hw_delay_tx.delay_info);
kfree(acdb_data.hw_delay_rx.delay_info);
if (atomic64_read(&acdb_data.mem_len)) {
mutex_lock(&acdb_data.acdb_mutex);
/* unmap all cal data */
result = unmap_cal_tables();
if (result < 0)
pr_err("%s: unmap_cal_tables failed, err = %d\n",
__func__, result);
atomic64_set(&acdb_data.mem_len, 0);
for (i = 0; i < MAX_VOCPROC_TYPES; i++) {
@@ -1214,7 +1217,8 @@ static int deregister_memory(void)
acdb_data.ion_handle = NULL;
mutex_unlock(&acdb_data.acdb_mutex);
}
return result;
mutex_unlock(&acdb_data.acdb_mutex);
return 0;
}
static int register_memory(void)
@@ -1228,6 +1232,7 @@ static int register_memory(void)
pr_debug("%s\n", __func__);
mutex_lock(&acdb_data.acdb_mutex);
allocate_hw_delay_entries();
for (i = 0; i < MAX_VOCPROC_TYPES; i++) {
acdb_data.col_data[i] = kmalloc(MAX_COL_SIZE, GFP_KERNEL);
atomic_set(&acdb_data.vocproc_col_cal[i].cal_kvaddr,
@@ -1543,9 +1548,6 @@ static int acdb_release(struct inode *inode, struct file *f)
else
result = deregister_memory();
kfree(acdb_data.hw_delay_rx.delay_info);
kfree(acdb_data.hw_delay_tx.delay_info);
return result;
}