From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933249AbXIJOzz (ORCPT ); Mon, 10 Sep 2007 10:55:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759826AbXIJOxE (ORCPT ); Mon, 10 Sep 2007 10:53:04 -0400 Received: from mx1.redhat.com ([66.187.233.31]:60116 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760643AbXIJOxA (ORCPT ); Mon, 10 Sep 2007 10:53:00 -0400 Date: Mon, 10 Sep 2007 10:52:52 -0400 Message-Id: <200709101452.l8AEqqse016299@dantu.rdu.redhat.com> From: Jeff Layton Subject: [PATCH 7/7] CIFS: ignore mode change if it's just for clearing setuid/setgid bits To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.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 CIFS, skip the mode change and let the server handle it. Signed-off-by: Jeff Layton --- fs/cifs/inode.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 66436f5..8fa3d63 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1547,6 +1547,11 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs) } time_buf.Attributes = 0; + + /* skip mode change if it's just for clearing setuid/setgid */ + if (attrs->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID)) + attrs->ia_valid &= ~ATTR_MODE; + if (attrs->ia_valid & ATTR_MODE) { cFYI(1, ("Mode changed to 0x%x", attrs->ia_mode)); mode = attrs->ia_mode; -- 1.5.2.1