leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pstore: Correct the max_dump_cnt clearing of ramoops

Browse Source 
In case that ramoops_init_przs failed, max_dump_cnt won't be reset to
zero in error handle path.

Signed-off-by: Liu ShuoX <shuox.liu@intel.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Liu ShuoX 2014-03-17 14:07:00 -07:00 committed by Tony Luck
parent b0aa931fb8
commit 34f0ec82e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/pstore/ram.c
View File

@ -320,6 +320,7 @@ static void ramoops_free_przs(struct ramoops_context *cxt)
{ {
int i; int i;
cxt->max_dump_cnt = 0;
if (!cxt->przs) if (!cxt->przs)
return; return;
@ -350,7 +351,7 @@ static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt,
GFP_KERNEL); GFP_KERNEL);
if (!cxt->przs) { if (!cxt->przs) {
dev_err(dev, "failed to initialize a prz array for dumps\n"); dev_err(dev, "failed to initialize a prz array for dumps\n");
return -ENOMEM; goto fail_prz;
} }
for (i = 0; i < cxt->max_dump_cnt; i++) { for (i = 0; i < cxt->max_dump_cnt; i++) {
@ -508,7 +509,6 @@ fail_buf:
kfree(cxt->pstore.buf); kfree(cxt->pstore.buf);
fail_clear: fail_clear:
cxt->pstore.bufsize = 0; cxt->pstore.bufsize = 0;
cxt->max_dump_cnt = 0;
fail_cnt: fail_cnt:
kfree(cxt->fprz); kfree(cxt->fprz);
fail_init_fprz: fail_init_fprz: