From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755498AbXIQLbc (ORCPT ); Mon, 17 Sep 2007 07:31:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755346AbXIQL34 (ORCPT ); Mon, 17 Sep 2007 07:29:56 -0400 Received: from mx1.redhat.com ([66.187.233.31]:36982 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753768AbXIQL3w (ORCPT ); Mon, 17 Sep 2007 07:29:52 -0400 Date: Mon, 17 Sep 2007 07:29:36 -0400 Message-Id: <200709171129.l8HBTaTA024392@dantu.rdu.redhat.com> From: Jeff Layton Subject: [PATCH 6/7] NFS: if ATTR_KILL_S*ID bits are set, then skip mode change To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org Cc: linux-cifs-client@lists.samba.org, nfs@lists.sourceforge.net, ecryptfs-devel@lists.sourceforge.net, reiserfs-devel@vger.kernel.org, unionfs@filesystems.org Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org If the ATTR_KILL_S*ID bits are set then any mode change is only for clearing the setuid/setgid bits. For NFS, skip the mode change and let the server handle it. Signed-off-by: Jeff Layton --- fs/nfs/inode.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 45633f9..441bd8b 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -327,6 +327,10 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) nfs_inc_stats(inode, NFSIOS_VFSSETATTR); + /* skip mode change if it's just for clearing setuid/setgid */ + if (attr->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID)) + attr->ia_valid &= ~ATTR_MODE; + if (attr->ia_valid & ATTR_SIZE) { if (!S_ISREG(inode->i_mode) || attr->ia_size == i_size_read(inode)) attr->ia_valid &= ~ATTR_SIZE; -- 1.5.2.1