linux-kernel - [PATCH 3.12 053/122] pstore: skip zero size persistent ram buffer in traverse

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]

Message-Id: <013d52e2500f66563ff14c74f43b68ab16cef9f1.1424099973.git.jslaby@suse.cz>
Date:	Tue, 17 Feb 2015 12:34:00 +0100
From:	Jiri Slaby <jslaby@...e.cz>
To:	stable@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, Liu ShuoX <shuox.liu@...el.com>,
	"Zhang, Yanmin" <yanmin_zhang@...ux.intel.com>,
	Colin Cross <ccross@...roid.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Tony Luck <tony.luck@...el.com>,
	HuKeping <hukeping@...wei.com>, Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 053/122] pstore: skip zero size persistent ram buffer in traverse

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

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit aa9a4a1edfbd3d223af01db833da2f07850bc655 upstream.

In ramoops_pstore_read, a valid prz pointer with zero size buffer will
break traverse of all persistent ram buffers.  The latter buffer might be
lost.

Signed-off-by: Liu ShuoX <shuox.liu@...el.com>
Cc: "Zhang, Yanmin" <yanmin_zhang@...ux.intel.com>
Cc: Colin Cross <ccross@...roid.com>
Reviewed-by: Kees Cook <keescook@...omium.org>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@...el.com>
Cc: HuKeping <hukeping@...wei.com>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
 fs/pstore/ram.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 36ffe55b579d..808435a9e2e1 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -126,12 +126,12 @@ ramoops_get_next_prz(struct persistent_ram_zone *przs[], uint *c, uint max,
 
 	prz = przs[i];
 
-	if (update) {
-		/* Update old/shadowed buffer. */
+	/* Update old/shadowed buffer. */
+	if (update)
 		persistent_ram_save_old(prz);
-		if (!persistent_ram_old_size(prz))
-			return NULL;
-	}
+
+	if (!persistent_ram_old_size(prz))
+		return NULL;
 
 	*typep = type;
 	*id = i;
-- 
2.2.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/