diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-28 10:41:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-28 10:41:22 -0700 |
| commit | 38ae1dfc783e1d1ccae72dbe03447c22643e7ef4 (patch) | |
| tree | c887d134353084d072710d46a26127893de08a79 | |
| parent | Merge git://www.linux-watchdog.org/linux-watchdog (diff) | |
| parent | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus (diff) | |
| download | linux-rng-38ae1dfc783e1d1ccae72dbe03447c22643e7ef4.tar.xz linux-rng-38ae1dfc783e1d1ccae72dbe03447c22643e7ef4.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | security/selinux/selinuxfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 1684bcc78b34..5fde34326dcf 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; |