From patchwork Thu Mar 8 01:34:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 7162 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D9A8023EA9 for ; Thu, 8 Mar 2012 01:35:22 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9D5BCA1852A for ; Thu, 8 Mar 2012 01:35:22 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so12685171iag.11 for ; Wed, 07 Mar 2012 17:35:22 -0800 (PST) Received: by 10.50.42.132 with SMTP id o4mr3495295igl.58.1331170522434; Wed, 07 Mar 2012 17:35:22 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.53.18 with SMTP id k18csp168ibg; Wed, 7 Mar 2012 17:35:21 -0800 (PST) Received: by 10.52.240.144 with SMTP id wa16mr6882502vdc.94.1331170521611; Wed, 07 Mar 2012 17:35:21 -0800 (PST) Received: from e37.co.us.ibm.com (e37.co.us.ibm.com. [32.97.110.158]) by mx.google.com with ESMTPS id l17si49517vcw.73.2012.03.07.17.35.21 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Mar 2012 17:35:21 -0800 (PST) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.158 as permitted sender) client-ip=32.97.110.158; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.158 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Mar 2012 18:35:20 -0700 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Mar 2012 18:34:50 -0700 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 7AA6219D8050; Wed, 7 Mar 2012 18:34:44 -0700 (MST) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q281YnxI180854; Wed, 7 Mar 2012 18:34:49 -0700 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q281YmK9019498; Wed, 7 Mar 2012 18:34:49 -0700 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q281Ymuf019494; Wed, 7 Mar 2012 18:34:48 -0700 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id C79D5C0421; Wed, 7 Mar 2012 17:34:46 -0800 (PST) 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-7408-0000-0000-0000034A064E X-Gm-Message-State: ALoCoQlxIXw69FREplgHo0xFV80xDg0nSI97lF4k/wzlrkmkmw1PTt+Yxqphsjt1krX2KwSVAkXg 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;