From patchwork Wed Mar 7 21:58:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 7149 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 4741A23E64 for ; Wed, 7 Mar 2012 21:59:07 +0000 (UTC) Received: from mail-gy0-f180.google.com (mail-gy0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 13EE0A184FF for ; Wed, 7 Mar 2012 21:59:06 +0000 (UTC) Received: by mail-gy0-f180.google.com with SMTP id z12so3795456ghb.11 for ; Wed, 07 Mar 2012 13:59:06 -0800 (PST) Received: by 10.50.183.137 with SMTP id em9mr5079326igc.58.1331157546613; Wed, 07 Mar 2012 13:59:06 -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 k18csp23012ibg; Wed, 7 Mar 2012 13:59:06 -0800 (PST) Received: by 10.68.240.164 with SMTP id wb4mr5761737pbc.57.1331157545978; Wed, 07 Mar 2012 13:59:05 -0800 (PST) Received: from e34.co.us.ibm.com (e34.co.us.ibm.com. [32.97.110.152]) by mx.google.com with ESMTPS id l9si2242250pbi.219.2012.03.07.13.59.05 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Mar 2012 13:59:05 -0800 (PST) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.152 as permitted sender) client-ip=32.97.110.152; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.152 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Mar 2012 14:59:04 -0700 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Mar 2012 14:59:02 -0700 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 829E619D8053; Wed, 7 Mar 2012 14:58:56 -0700 (MST) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q27LwaDe071792; Wed, 7 Mar 2012 14:58:37 -0700 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q27Lwajs018164; Wed, 7 Mar 2012 14:58:36 -0700 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q27LwXNE017941; Wed, 7 Mar 2012 14:58:34 -0700 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id B4BE8C0423; Wed, 7 Mar 2012 13:58:30 -0800 (PST) From: John Stultz To: lkml Cc: Colin Cross , Greg KH , Android Kernel Team , John Stultz Subject: [PATCH 12/13] android: staging: ram_console: fix crash in ram_console_late_init Date: Wed, 7 Mar 2012 13:58:22 -0800 Message-Id: <1331157503-3413-13-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1331157503-3413-1-git-send-email-john.stultz@linaro.org> References: <1331157503-3413-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12030721-1780-0000-0000-000003CBC5C1 X-IBM-ISS-SpamDetectors: X-IBM-ISS-DetailInfo: BY=3.00000256; HX=3.00000185; KW=3.00000007; PH=3.00000001; SC=3.00000001; SDB=6.00120044; UDB=6.00029043; UTC=2012-03-07 21:59:04 X-Gm-Message-State: ALoCoQljCLGX3MR9gBC4PyJN3Ff4Y59Pp7KOJB31HyTWVU2Mbz8xAOnCky0l3apUf90ZeDr3hFhg 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 Change-Id: Idff0f690406cdb2fe977bab64a39dc8b40dd4566 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;