From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: Colin Cross <ccross@android.com>,
Greg KH <gregkh@linuxfoundation.org>,
Android Kernel Team <kernel-team@android.com>,
John Stultz <john.stultz@linaro.org>
Subject: [PATCH 12/13] android: staging: ram_console: fix crash in ram_console_late_init
Date: Wed, 7 Mar 2012 13:58:22 -0800 [thread overview]
Message-ID: <1331157503-3413-13-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1331157503-3413-1-git-send-email-john.stultz@linaro.org>
From: Colin Cross <ccross@android.com>
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 <gregkh@linuxfoundation.org>
CC: Android Kernel Team <kernel-team@android.com>
Change-Id: Idff0f690406cdb2fe977bab64a39dc8b40dd4566
Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
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
next prev parent reply other threads:[~2012-03-07 22:00 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-07 21:58 [PATCH 00/13] staging: Android updates John Stultz
2012-03-07 21:58 ` [PATCH 01/13] android: lowmemorykiller: Fix warning on 64bit John Stultz
2012-03-07 22:04 ` Greg KH
2012-03-07 22:24 ` John Stultz
2012-03-07 21:58 ` [PATCH 02/13] android: ram_console: set CON_ANYTIME console flag John Stultz
2012-03-07 22:07 ` Greg KH
2012-03-07 21:58 ` [PATCH 03/13] android: ram_console: move footer strings John Stultz
2012-03-07 21:58 ` [PATCH 04/13] android: ram_console: drop early buffer support John Stultz
2012-03-07 21:58 ` [PATCH 05/13] android: ram_console: drop verbose ram_console support John Stultz
2012-03-07 21:58 ` [PATCH 06/13] android: ram_console: split out persistent ram John Stultz
2012-03-07 21:58 ` [PATCH 07/13] android: persistent_ram: refactor ecc support John Stultz
2012-03-07 22:21 ` Daniel Walker
2012-03-07 21:58 ` [PATCH 08/13] android: persistent_ram: handle reserving and mapping memory John Stultz
2012-03-07 22:08 ` Greg KH
2012-03-07 22:16 ` John Stultz
2012-03-08 1:46 ` Greg KH
2012-03-07 21:58 ` [PATCH 09/13] android: persistent_ram: make persistent_ram_write atomic John Stultz
2012-03-07 21:58 ` [PATCH 10/13] android: persistent_ram: add notrace to persistent_ram_write John Stultz
2012-03-07 21:58 ` [PATCH 11/13] android: persistent_trace: ftrace into persistent_ram John Stultz
2012-03-07 22:10 ` Greg KH
2012-03-07 22:40 ` John Stultz
2012-03-07 21:58 ` John Stultz [this message]
2012-03-07 21:58 ` [PATCH 13/13] android: ram_console: honor dmesg_restrict John Stultz
2012-03-07 22:10 ` Greg KH
2012-03-07 22:11 ` [PATCH 00/13] staging: Android updates Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331157503-3413-13-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=ccross@android.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox