---

yaml --- r: 363291 b: refs/heads/master c: 1e70bd4 h: refs/heads/master i: 363289: 9d45f2e 363287: 1e30c38 v: v3
git-mirror · Mar 5, 2013 · 880ab97 · 880ab97
1 parent 812345f
commit 880ab97
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0441bcf4db64e9825937916fe64d539d12c3fead
+refs/heads/master: 1e70bd46a5a950b7ba319e50bdfed9d20ed9fd73
diff --git a/trunk/drivers/staging/android/logger.c b/trunk/drivers/staging/android/logger.c
@@ -695,6 +695,11 @@ static long logger_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 			ret = -EBADF;
 			break;
 		}
+		if (!(in_egroup_p(file->f_dentry->d_inode->i_gid) ||
+				capable(CAP_SYSLOG))) {
+			ret = -EPERM;
+			break;
+		}
 		list_for_each_entry(reader, &log->readers, list)
 			reader->r_off = log->w_off;
 		log->head = log->w_off;