From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753643AbbC0JSj (ORCPT ); Fri, 27 Mar 2015 05:18:39 -0400 Received: from tundra.namei.org ([65.99.196.166]:60620 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753272AbbC0JSf (ORCPT ); Fri, 27 Mar 2015 05:18:35 -0400 Date: Fri, 27 Mar 2015 20:18:30 +1100 (AEDT) From: James Morris To: Linus Torvalds cc: linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [GIT PULL] SELinux bugfix Message-ID: User-Agent: Alpine 2.11 (LRH 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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: Signed-off-by: Joe Perches Acked-by: Stephen Smalley [PM: tweaked subject line] Signed-off-by: Paul Moore 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;