diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-03-27 20:33:27 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-03-27 20:33:27 +1100 |
| commit | 641628146c1986c966ae030e65bb6f30feef0fd0 (patch) | |
| tree | f26a935d0760d20b4f5cdaefbc4c6e2a49e62a94 /security | |
| parent | 3c435c1e472ba344ee25f795f4807d4457e61f6c (diff) | |
| parent | 6436a123a147db51a0b06024a8350f4c230e73ff (diff) | |
| download | linux-641628146c1986c966ae030e65bb6f30feef0fd0.tar.gz linux-641628146c1986c966ae030e65bb6f30feef0fd0.tar.bz2 linux-641628146c1986c966ae030e65bb6f30feef0fd0.zip | |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus
Diffstat (limited to 'security')
| -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; |