Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756354AbbBCXWK (ORCPT ); Tue, 3 Feb 2015 18:22:10 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:55281 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753688AbbBCXWH (ORCPT ); Tue, 3 Feb 2015 18:22:07 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu ShuoX , Kees Cook , Tony Luck , HuKeping Subject: [PATCH 3.14 30/33] pstore: Fix NULL pointer fault if get NULL prz in ramoops_get_next_prz Date: Tue, 3 Feb 2015 15:14:53 -0800 Message-Id: <20150203231240.313085423@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: 1228 Lines: 43 3.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Liu ShuoX commit b0aa931fb84431394d995472d0af2a6c2b61064d upstream. ramoops_get_next_prz get the prz according the paramters. If it get a uninitialized prz, access its members by following persistent_ram_old_size(prz) will cause a NULL pointer crash. Ex: if ftrace_size is 0, fprz will be NULL. Fix it by return NULL in advance. Signed-off-by: Liu ShuoX Acked-by: Kees Cook Signed-off-by: Tony Luck Cc: HuKeping Signed-off-by: Greg Kroah-Hartman --- fs/pstore/ram.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -125,6 +125,8 @@ ramoops_get_next_prz(struct persistent_r return NULL; prz = przs[i]; + if (!prz) + return NULL; /* Update old/shadowed buffer. */ if (update) -- 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/