Return-Path: Received: from mail-qc0-f178.google.com ([209.85.216.178]:33598 "EHLO mail-qc0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751717AbbFES2y (ORCPT ); Fri, 5 Jun 2015 14:28:54 -0400 Received: by qcnj1 with SMTP id j1so7103330qcn.0 for ; Fri, 05 Jun 2015 11:28:53 -0700 (PDT) From: Paul Moore To: "J. Bruce Fields" Cc: Stephen Smalley , Eric Paris , selinux@tycho.nsa.gov, linux-nfs@vger.kernel.org, Richard Chan , David Quigley Subject: Re: [PATCH] selinux: fix setting of security labels on NFS Date: Fri, 05 Jun 2015 14:28:51 -0400 Message-ID: <1445478.RRUV9J93hm@sifl> In-Reply-To: <20150604195725.GC5209@fieldses.org> References: <20150604195725.GC5209@fieldses.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Sender: linux-nfs-owner@vger.kernel.org List-ID: On Thursday, June 04, 2015 03:57:25 PM J. Bruce Fields wrote: > From: "J. Bruce Fields" > > Before calling into the filesystem, vfs_setxattr calls > security_inode_setxattr, which ends up calling selinux_inode_setxattr in > our case. That returns -EOPNOTSUPP whenever SBLABEL_MNT is not set. > SBLABEL_MNT was supposed to be set by sb_finish_set_opts, which sets it > only if selinux_is_sblabel_mnt returns true. > > The selinux_is_sblabel_mnt logic was broken by eadcabc697e9 "SELinux: do > all flags twiddling in one place", which didn't take into the account > the SECURITY_FS_USE_NATIVE behavior that had been introduced for nfs > with eb9ae686507b "SELinux: Add new labeling type native labels". > > This caused setxattr's of security labels over NFSv4.2 to fail. > > Cc: stable@kernel.org > Cc: Eric Paris > Cc: David Quigley > Reported-by: Richard Chan > Signed-off-by: J. Bruce Fields > --- > security/selinux/hooks.c | 1 + > 1 file changed, 1 insertion(+) Applied, thanks. In the future, you don't have to worry about marking it for stable, I'll take care of that when I merge it into the tree. > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index e8a060bd9677..171fb30e4b99 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -403,6 +403,7 @@ static int selinux_is_sblabel_mnt(struct super_block > *sb) return sbsec->behavior == SECURITY_FS_USE_XATTR || > sbsec->behavior == SECURITY_FS_USE_TRANS || > sbsec->behavior == SECURITY_FS_USE_TASK || > + sbsec->behavior == SECURITY_FS_USE_NATIVE || > /* Special handling. Genfs but also in-core setxattr handler */ > !strcmp(sb->s_type->name, "sysfs") || > !strcmp(sb->s_type->name, "pstore") || -- paul moore www.paul-moore.com