Kernel bump from 4.1.3-rt to 4.1.7-rt.

[kvmfornfv.git] / kernel / kernel / printk / printk.c

diff --git a/kernel/kernel/printk/printk.c b/kernel/kernel/printk/printk.c
index 6062a04..c2d5877 100644 (file)
--- a/kernel/kernel/printk/printk.c
+++ b/kernel/kernel/printk/printk.c
@@ -484,11 +484,11 @@ int check_syslog_permissions(int type, bool from_file)
         * already done the capabilities checks at open time.
         */
        if (from_file && type != SYSLOG_ACTION_OPEN)
-               return 0;
+               goto ok;
 
        if (syslog_action_restricted(type)) {
                if (capable(CAP_SYSLOG))
-                       return 0;
+                       goto ok;
                /*
                 * For historical reasons, accept CAP_SYS_ADMIN too, with
                 * a warning.
@@ -498,10 +498,11 @@ int check_syslog_permissions(int type, bool from_file)
                                     "CAP_SYS_ADMIN but no CAP_SYSLOG "
                                     "(deprecated).\n",
                                 current->comm, task_pid_nr(current));
-                       return 0;
+                       goto ok;
                }
                return -EPERM;
        }
+ok:
        return security_syslog(type);
 }
 
@@ -1288,10 +1289,6 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
        if (error)
                goto out;
 
-       error = security_syslog(type);
-       if (error)
-               return error;
-
        switch (type) {
        case SYSLOG_ACTION_CLOSE:       /* Close log */
                break;