aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-28 10:41:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-28 10:41:22 -0700
commit38ae1dfc783e1d1ccae72dbe03447c22643e7ef4 (patch)
treec887d134353084d072710d46a26127893de08a79
parenta39bdfb590f54d0f41d6a5b352b085322d007dcd (diff)
parent641628146c1986c966ae030e65bb6f30feef0fd0 (diff)
downloadlinux-38ae1dfc783e1d1ccae72dbe03447c22643e7ef4.tar.gz
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
-rw-r--r--security/selinux/selinuxfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 1684bcc78b3..5fde34326dc 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -152,7 +152,7 @@ static ssize_t sel_write_enforce(struct file *file, const char __user *buf,
goto out;
/* No partial writes. */
- length = EINVAL;
+ length = -EINVAL;
if (*ppos != 0)
goto out;