From d786a48dfb5511be94e6efa01c1e0cfc8620d58b Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Wed, 7 Mar 2012 17:34:38 -0800
Subject: [PATCH] --- yaml --- r: 289216 b: refs/heads/master c:
 dd09979346813357200adf71b07003fc0a778089 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/android/ram_console.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e7af6075bfac..bf9845bd6389 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a21138d3f76296ad070a3692d72eb529e7d5d2c
+refs/heads/master: dd09979346813357200adf71b07003fc0a778089
diff --git a/trunk/drivers/staging/android/ram_console.c b/trunk/drivers/staging/android/ram_console.c
index d956b8441442..b242be246cd8 100644
--- a/trunk/drivers/staging/android/ram_console.c
+++ b/trunk/drivers/staging/android/ram_console.c
@@ -99,6 +99,9 @@ static ssize_t ram_console_read_old(struct file *file, char __user *buf,
 	char *str;
 	int ret;
 
+	if (dmesg_restrict && !capable(CAP_SYSLOG))
+		return -EPERM;
+
 	/* Main last_kmsg log */
 	if (pos < old_log_size) {
 		count = min(len, (size_t)(old_log_size - pos));