commit 38ae1dfc783e1d1ccae72dbe03447c22643e7ef4
author Linus Torvalds <torvalds@linux-foundation.org> Sat Mar 28 10:41:22 2015 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Mar 28 10:41:22 2015 -0700
tree c887d134353084d072710d46a26127893de08a79
parent a39bdfb590f54d0f41d6a5b352b085322d007dcd
parent 641628146c1986c966ae030e65bb6f30feef0fd0

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull selinux bugfix from James Morris.

Fix broken return value.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: fix sel_write_enforce broken return value

security/selinux/selinuxfs.c

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 1684bcc..5fde343 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -152,7 +152,7 @@
 		goto out;
 
 	/* No partial writes. */
-	length = EINVAL;
+	length = -EINVAL;
 	if (*ppos != 0)
 		goto out;