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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_1 autolearn=unavailable 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 06681C07E95 for ; Tue, 20 Jul 2021 07:33:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D6CC8611C1 for ; Tue, 20 Jul 2021 07:33:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235185AbhGTGwq (ORCPT ); Tue, 20 Jul 2021 02:52:46 -0400 Received: from out30-131.freemail.mail.aliyun.com ([115.124.30.131]:56039 "EHLO out30-131.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229916AbhGTGwn (ORCPT ); Tue, 20 Jul 2021 02:52:43 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0UgP8xJL_1626766400; Received: from admindeMacBook-Pro-2.local(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0UgP8xJL_1626766400) by smtp.aliyun-inc.com(127.0.0.1); Tue, 20 Jul 2021 15:33:20 +0800 Subject: Re: [PATCH v2] vfs: only allow SETFLAGS to set DAX flag on files and dirs To: "Darrick J. Wong" Cc: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org References: <20210719023834.104053-1-jefflexu@linux.alibaba.com> <20210719174331.GH22357@magnolia> From: JeffleXu Message-ID: <729b4efa-8903-c5ec-4e29-7f4e0d02ce2a@linux.alibaba.com> Date: Tue, 20 Jul 2021 15:33:20 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210719174331.GH22357@magnolia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On 7/20/21 1:43 AM, Darrick J. Wong wrote: > On Mon, Jul 19, 2021 at 10:38:34AM +0800, Jeffle Xu wrote: >> This is similar to commit dbc77f31e58b ("vfs: only allow FSSETXATTR to >> set DAX flag on files and dirs"). >> >> Though the underlying filesystems may have filtered invalid flags, e.g., >> ext4_mask_flags() called in ext4_fileattr_set(), also check it in VFS >> layer. >> >> Signed-off-by: Jeffle Xu >> --- >> changes since v1: >> - add separate parentheses surrounding flag tests >> --- >> fs/ioctl.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/fs/ioctl.c b/fs/ioctl.c >> index 1e2204fa9963..90cfaa4db03a 100644 >> --- a/fs/ioctl.c >> +++ b/fs/ioctl.c >> @@ -835,7 +835,7 @@ static int fileattr_set_prepare(struct inode *inode, >> * It is only valid to set the DAX flag on regular files and >> * directories on filesystems. >> */ >> - if ((fa->fsx_xflags & FS_XFLAG_DAX) && >> + if (((fa->fsx_xflags & FS_XFLAG_DAX) || (fa->flags & FS_DAX_FL)) && > > Isn't fileattr_fill_flags supposed to fill out fa->fsx_xflags from > fa->flags for a SETFLAGS call? Yes, but fa->fsx_xflags inherited from fa->flags (at least in ext4 it is) is the original flags/xflags of the file before SETFLAG/FSSETXATTR. Here we want to check *new* flags/xflags. > >> !(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode))) >> return -EINVAL; >> >> -- >> 2.27.0 >> -- Thanks, Jeffle