pstore: Correct the max_dump_cnt clearing of ramoops

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 <[email protected]>
Acked-by: Kees Cook <[email protected]>
Signed-off-by: Tony Luck <[email protected]>

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 6f96d8c2a711995beff74e87d22baefd5da8b3a8..3b5744306ed82e812b71f55dc31e5e495d05a028 100644 (file)
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -320,6 +320,7 @@ static void ramoops_free_przs(struct ramoops_context *cxt)
 {
        int i;
 
+       cxt->max_dump_cnt = 0;
        if (!cxt->przs)
                return;
 
@@ -350,7 +351,7 @@ static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt,
                             GFP_KERNEL);
        if (!cxt->przs) {
                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++) {
@@ -508,7 +509,6 @@ fail_buf:
        kfree(cxt->pstore.buf);
 fail_clear:
        cxt->pstore.bufsize = 0;
-       cxt->max_dump_cnt = 0;
 fail_cnt:
        kfree(cxt->fprz);
 fail_init_fprz: