Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into...

diff --combined security/selinux/hooks.c
index e663141,654f071..c603b20
--- 1/security/selinux/hooks.c
--- 2/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -3381,12 -3381,14 +3381,12 @@@ static int selinux_file_fcntl(struct fi
        return err;
  }
  
 -static int selinux_file_set_fowner(struct file *file)
 +static void selinux_file_set_fowner(struct file *file)
  {
        struct file_security_struct *fsec;
  
        fsec = file->f_security;
        fsec->fown_sid = current_sid();
 -
 -      return 0;
  }
  
  static int selinux_file_send_sigiotask(struct task_struct *tsk,
@@@ -4725,9 -4727,10 +4725,10 @@@ static int selinux_nlmsg_perm(struct so
        err = selinux_nlmsg_lookup(sksec->sclass, nlh->nlmsg_type, &perm);
        if (err) {
                if (err == -EINVAL) {
-                       WARN_ONCE(1, "selinux_nlmsg_perm: unrecognized netlink message:"
-                                 " protocol=%hu nlmsg_type=%hu sclass=%hu\n",
-                                 sk->sk_protocol, nlh->nlmsg_type, sksec->sclass);
+                       printk(KERN_WARNING
+                              "SELinux: unrecognized netlink message:"
+                              " protocol=%hu nlmsg_type=%hu sclass=%hu\n",
+                              sk->sk_protocol, nlh->nlmsg_type, sksec->sclass);
                        if (!selinux_enforcing || security_get_allow_unknown())
                                err = 0;
                }