Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933422AbbBCXYT (ORCPT ); Tue, 3 Feb 2015 18:24:19 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:55308 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932281AbbBCXYP (ORCPT ); Tue, 3 Feb 2015 18:24:15 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu ShuoX , "Zhang, Yanmin" , Colin Cross , Kees Cook , Andrew Morton , Tony Luck , HuKeping Subject: [PATCH 3.14 29/33] pstore: skip zero size persistent ram buffer in traverse Date: Tue, 3 Feb 2015 15:14:52 -0800 Message-Id: <20150203231240.159593362@linuxfoundation.org> X-Mailer: git-send-email 2.2.2 In-Reply-To: <20150203231235.843316867@linuxfoundation.org> References: <20150203231235.843316867@linuxfoundation.org> User-Agent: quilt/0.63-1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1477 Lines: 52 3.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Liu ShuoX 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 Cc: "Zhang, Yanmin" Cc: Colin Cross Reviewed-by: Kees Cook Signed-off-by: Andrew Morton Signed-off-by: Tony Luck Cc: HuKeping Signed-off-by: Greg Kroah-Hartman --- fs/pstore/ram.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -126,12 +126,12 @@ ramoops_get_next_prz(struct persistent_r 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/