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

38ae1dfc · Linus Torvalds <[email protected]> · 2015-03-28 10:41:22 -07:00

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

Commit: 38ae1dfc783e1d1ccae72dbe03447c22643e7ef4
Parents: a39bdfb5 · 64162814

Merge commit. Changes below are compared with the first parent: a39bdfb5.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
security/selinux/selinuxfs.c	modified	+1	−1	View file

security/selinux/selinuxfs.c

View file

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 @@ 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;
 