From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B93E1C433E9 for ; Mon, 15 Mar 2021 17:13:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7045964EB9 for ; Mon, 15 Mar 2021 17:13:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234896AbhCORMf (ORCPT ); Mon, 15 Mar 2021 13:12:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:35318 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234431AbhCORMJ (ORCPT ); Mon, 15 Mar 2021 13:12:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E6AF564E99; Mon, 15 Mar 2021 17:12:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615828328; bh=I3pRBUwSpdfZFbCEJdEZhaXlV/7cL3dhS7d1Tr9fopg=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=ePZc4bV2v72YeXfwQp77jV/x/zPRBIuWHq+MNcHpQ+vVuobPCxNBfQGOQBv/oPQ+C NB/EaGq80F15m/ZdA4YQzehsWhn9G2DjwZnWyiZCsijHIRVl/G5PV5fK8SYmRKM06X afzF0ycQBZHpecRdiLXF5gLNUTiD6ecH1mkwXApQUueaNpcguiJMirLSihatWn8B7p q5Cph0/wV9lErA6chbz34U0zue/pqC+UkG2uaJ1X9B1zcF8cBQiga2f+KrYmoQDudu rtLjdtYw6P1N3E7Isy8lzu0UZUTjeojk4mjwpT6KhFFZNyP0Ss2mUmDxIhCAZ0bKtA 9V3nv/x8JJZiA== Message-ID: Subject: Re: [PATCH v2 09/15] do_cifs_create(): don't set ->i_mode of something we had not created From: Jeff Layton To: Al Viro , Linus Torvalds Cc: linux-fsdevel@vger.kernel.org, David Howells , Hans de Goede , Mike Marshall , Joseph Qi , Bob Peterson , Steve French , Richard Weinberger , Dominique Martinet , Arnd Bergmann Date: Mon, 15 Mar 2021 13:12:06 -0400 In-Reply-To: <20210313043824.1283821-9-viro@zeniv.linux.org.uk> References: <20210313043824.1283821-1-viro@zeniv.linux.org.uk> <20210313043824.1283821-9-viro@zeniv.linux.org.uk> Content-Type: text/plain; charset="ISO-8859-15" User-Agent: Evolution 3.38.4 (3.38.4-1.fc33) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Sat, 2021-03-13 at 04:38 +0000, Al Viro wrote: > If the file had existed before we'd called ->atomic_open() (without > O_EXCL, that is), we have no more business setting ->i_mode than > we would setting ->i_uid or ->i_gid. We also have no business > doing either if another client has managed to get unlink+mkdir > between ->open() and cifs_inode_get_info(). > > Signed-off-by: Al Viro > --- >  fs/cifs/dir.c | 19 ++++++++++--------- >  1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c > index a3fb81e0ba17..9d7ae93c8af7 100644 > --- a/fs/cifs/dir.c > +++ b/fs/cifs/dir.c > @@ -418,15 +418,16 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid, >   if (newinode) { >   if (server->ops->set_lease_key) >   server->ops->set_lease_key(newinode, fid); > - if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM) > - newinode->i_mode = mode; > - if ((*oplock & CIFS_CREATE_ACTION) && > - (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID)) { > - newinode->i_uid = current_fsuid(); > - if (inode->i_mode & S_ISGID) > - newinode->i_gid = inode->i_gid; > - else > - newinode->i_gid = current_fsgid(); > + if ((*oplock & CIFS_CREATE_ACTION) && S_ISREG(newinode->i_mode)) { > + if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM) > + newinode->i_mode = mode; > + if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) { > + newinode->i_uid = current_fsuid(); > + if (inode->i_mode & S_ISGID) > + newinode->i_gid = inode->i_gid; > + else > + newinode->i_gid = current_fsgid(); > + } >   } >   } >   } Reviewed-by: Jeff Layton