Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes

1 files changed, 2 insertions, 0 deletions

diff --git a/security/commoncap.c b/security/commoncap.c
index 5e632b4857e4..04b80f9912bf 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -895,6 +895,8 @@ int cap_syslog(int type, bool from_file)
 {
         if (type != SYSLOG_ACTION_OPEN && from_file)
                 return 0;
+        if (dmesg_restrict && !capable(CAP_SYS_ADMIN))
+                return -EPERM;
         if ((type != SYSLOG_ACTION_READ_ALL &&
              type != SYSLOG_ACTION_SIZE_BUFFER) && !capable(CAP_SYS_ADMIN))
                 return -EPERM;