linux-kernel - [PATCH 2/2] pstore: correct the max_dump

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 11 Mar 2014 14:17:43 +0800
From:	Liu ShuoX <shuox.liu@...el.com>
To:	linux-kernel@...r.kernel.org
Cc:	anton@...msg.org, ccross@...roid.com, keescook@...omium.org,
	tony.luck@...el.com, yanmin_zhang@...ux.intel.com
Subject: [PATCH 2/2] pstore: correct the max_dump_cnt clearing of ramoops

From: Liu ShuoX <shuox.liu@...el.com>

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@...el.com>
---
  fs/pstore/ram.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 6f96d8c..522e530 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -326,6 +326,7 @@ static void ramoops_free_przs(struct ramoops_context *cxt)
  	for (i = 0; !IS_ERR_OR_NULL(cxt->przs[i]); i++)
  		persistent_ram_free(cxt->przs[i]);
  	kfree(cxt->przs);
+	cxt->max_dump_cnt = 0;
  }
  
  static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt,
@@ -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:
-- 
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/