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

Merge "soc: qcom: pil: Clear elf region on authentication failure"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-23 21:35:53 -08:00 • committed by Gerrit - the friendly Code Review server
commit 17ec241c6c
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/soc/qcom/peripheral-loader.c
View file

@ -595,6 +595,22 @@ static void pil_release_mmap(struct pil_desc *desc)
struct pil_priv *priv = desc->priv;
struct pil_seg *p, *tmp;
u64 zero = 0ULL;
if (priv->info) {
__iowrite32_copy(&priv->info->start, &zero,
sizeof(zero) / 4);
writel_relaxed(0, &priv->info->size);
}
list_for_each_entry_safe(p, tmp, &priv->segs, list) {
list_del(&p->list);
kfree(p);
}
}
static void pil_clear_segment(struct pil_desc *desc)
{
struct pil_priv *priv = desc->priv;
u8 __iomem *buf;
struct pil_map_fw_info map_fw_info = {
@ -613,16 +629,6 @@ static void pil_release_mmap(struct pil_desc *desc)
desc->unmap_fw_mem(buf, (priv->region_end - priv->region_start),
map_data);
if (priv->info) {
__iowrite32_copy(&priv->info->start, &zero,
sizeof(zero) / 4);
writel_relaxed(0, &priv->info->size);
}
list_for_each_entry_safe(p, tmp, &priv->segs, list) {
list_del(&p->list);
kfree(p);
}
}
#define IOMAP_SIZE SZ_1M
@ -914,6 +920,7 @@ out:
&desc->attrs);
priv->region = NULL;
}
pil_clear_segment(desc);
pil_release_mmap(desc);
}
return ret;