[GIT PULL] SELinux bugfix

[James Morris]

Please pull this fix for a long-standing bug in the SELinux code.

The following changes since commit 3c435c1e472ba344ee25f795f4807d4457e61f6c:

  Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2015-03-26 15:04:05 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus

James Morris (1):
      Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus

Joe Perches (1):
      selinux: fix sel_write_enforce broken return value

 security/selinux/selinuxfs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

---

commit 6436a123a147db51a0b06024a8350f4c230e73ff
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Mon Mar 23 18:01:35 2015 -0700

    selinux: fix sel_write_enforce broken return value
    
    Return a negative error value like the rest of the entries in this function.
    
    Cc: <stable@xxxxxxxxxxxxxxx>
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Acked-by:  Stephen Smalley <sds@xxxxxxxxxxxxx>
    [PM: tweaked subject line]
    Signed-off-by: Paul Moore <pmoore@xxxxxxxxxx>

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 33db1ad..138949a 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;
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/