---

yaml --- r: 289216 b: refs/heads/master c: dd09979 h: refs/heads/master v: v3
git-mirror · Mar 8, 2012 · d786a48 · d786a48
1 parent 82849b4
commit d786a48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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));