From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:38720 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752199AbdGCH6K (ORCPT ); Mon, 3 Jul 2017 03:58:10 -0400 Subject: Patch "NFSv4.2: Don't send mode again in post-EXCLUSIVE4_1 SETATTR with umask" has been added to the 4.11-stable tree To: bcodding@redhat.com, gregkh@linuxfoundation.org, trond.myklebust@primarydata.com Cc: , From: Date: Mon, 03 Jul 2017 09:57:55 +0200 Message-ID: <1499068675216140@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled NFSv4.2: Don't send mode again in post-EXCLUSIVE4_1 SETATTR with umask to the 4.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: nfsv4.2-don-t-send-mode-again-in-post-exclusive4_1-setattr-with-umask.patch and it can be found in the queue-4.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 501e7a4689378f8b1690089bfdd4f1e12ec22903 Mon Sep 17 00:00:00 2001 From: Benjamin Coddington Date: Fri, 2 Jun 2017 11:21:34 -0400 Subject: NFSv4.2: Don't send mode again in post-EXCLUSIVE4_1 SETATTR with umask From: Benjamin Coddington commit 501e7a4689378f8b1690089bfdd4f1e12ec22903 upstream. Now that we have umask support, we shouldn't re-send the mode in a SETATTR following an exclusive CREATE, or we risk having the same problem fixed in commit 5334c5bdac92 ("NFS: Send attributes in OPEN request for NFS4_CREATE_EXCLUSIVE4_1"), which is that files with S_ISGID will have that bit stripped away. Signed-off-by: Benjamin Coddington Fixes: dff25ddb4808 ("nfs: add support for the umask attribute") Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- fs/nfs/nfs4proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2588,7 +2588,8 @@ static inline void nfs4_exclusive_attrse /* Except MODE, it seems harmless of setting twice. */ if (opendata->o_arg.createmode != NFS4_CREATE_EXCLUSIVE && - attrset[1] & FATTR4_WORD1_MODE) + (attrset[1] & FATTR4_WORD1_MODE || + attrset[2] & FATTR4_WORD2_MODE_UMASK)) sattr->ia_valid &= ~ATTR_MODE; if (attrset[2] & FATTR4_WORD2_SECURITY_LABEL) Patches currently in stable-queue which might be from bcodding@redhat.com are queue-4.11/revert-nfs-nfs_rename-handle-erestartsys-dentry-left-behind.patch queue-4.11/nfsv4.2-don-t-send-mode-again-in-post-exclusive4_1-setattr-with-umask.patch