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

pstore/ram_core: Proper checking for post_init errors (e.g. improper ECC size)

Browse source 
We will implement variable-sized ECC buffers soon, so post_init routine
might fail much more likely, so we'd better check for its errors.

To make error handling simple, modify persistent_ram_free() to it be safe
at all times.

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Anton Vorontsov 2012-06-18 19:15:52 -07:00 • committed by Greg Kroah-Hartman
parent 90b58d9690
commit beeb94321a
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
fs/pstore/ram_core.c
View file

@ -427,11 +427,17 @@ static int __devinit persistent_ram_post_init(struct persistent_ram_zone *prz,
void persistent_ram_free(struct persistent_ram_zone *prz) void persistent_ram_free(struct persistent_ram_zone *prz)
{ {
if (pfn_valid(prz->paddr >> PAGE_SHIFT)) { if (!prz)
vunmap(prz->vaddr); return;
} else {
iounmap(prz->vaddr); if (prz->vaddr) {
release_mem_region(prz->paddr, prz->size); if (pfn_valid(prz->paddr >> PAGE_SHIFT)) {
vunmap(prz->vaddr);
} else {
iounmap(prz->vaddr);
release_mem_region(prz->paddr, prz->size);
}
prz->vaddr = NULL;
} }
persistent_ram_free_old(prz); persistent_ram_free_old(prz);
kfree(prz); kfree(prz);
@ -454,10 +460,12 @@ struct persistent_ram_zone * __devinit persistent_ram_new(phys_addr_t start,
if (ret) if (ret)
goto err; goto err;
persistent_ram_post_init(prz, ecc); ret = persistent_ram_post_init(prz, ecc);
if (ret)
goto err;
return prz; return prz;
err: err:
kfree(prz); persistent_ram_free(prz);
return ERR_PTR(ret); return ERR_PTR(ret);
} }