From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753776Ab2CHBfG (ORCPT ); Wed, 7 Mar 2012 20:35:06 -0500 Received: from e38.co.us.ibm.com ([32.97.110.159]:34039 "EHLO e38.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750866Ab2CHBez (ORCPT ); Wed, 7 Mar 2012 20:34:55 -0500 From: John Stultz To: lkml Cc: Colin Cross , Greg KH , Android Kernel Team , John Stultz Subject: [PATCH 10/11] android: staging: ram_console: fix crash in ram_console_late_init Date: Wed, 7 Mar 2012 17:34:37 -0800 Message-Id: <1331170478-30538-11-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1331170478-30538-1-git-send-email-john.stultz@linaro.org> References: <1331170478-30538-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12030801-5518-0000-0000-000002CE684A Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Cross If the persistent ram buffer is not available, ram_console_late_init would crash when dereferencing ram_console_zone. Return early if ram console was not initialized. CC: Greg KH CC: Android Kernel Team Signed-off-by: Colin Cross Signed-off-by: John Stultz --- drivers/staging/android/ram_console.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c index 29d347e..d956b84 100644 --- a/drivers/staging/android/ram_console.c +++ b/drivers/staging/android/ram_console.c @@ -150,6 +150,9 @@ static int __init ram_console_late_init(void) struct proc_dir_entry *entry; struct persistent_ram_zone *prz = ram_console_zone; + if (!prz) + return 0; + if (persistent_ram_old_size(prz) == 0) return 0; -- 1.7.3.2.146.gca209