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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_1 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 4F739C83008 for ; Tue, 28 Apr 2020 15:14:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0D7B3206D8 for ; Tue, 28 Apr 2020 15:14:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="DLZi3x2K" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728055AbgD1POk (ORCPT ); Tue, 28 Apr 2020 11:14:40 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:44700 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727108AbgD1POk (ORCPT ); Tue, 28 Apr 2020 11:14:40 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03SFDEmj148277; Tue, 28 Apr 2020 15:14:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2020-01-29; bh=0AWlMXyL7KDo766vHcQO/x66Qb8b+jq34+N+KcT4ZPs=; b=DLZi3x2KyD6UFwCp9625ROaVQeDlp00qaoctVDxD1k56AUkcX+64zIsbrsV8ilL0QVCa waYZ/hzyy4Ric0N1guWaiP4m8Qbg0pby49oD1ZFNlR8iE/ZVw1H8bRl3Z19HfSqRsObl e1QBfJDgR19DdDnGOASg0Fgw0QGv89+ugyajvFUjselXUJdPAJrCgEYiR4q5adI8TM8y 6eKFQvV3Sg7UHzdf+WXIQEGqDnA27W9qCbeBEzU/qyGr5QRkx5cZokO7NKcu6eBX2Wnk WlQXdKRGXvcIgx6l6e5/0KvFdgmL7NCOJKXKhQJ2bk8o9Y0paH2B0fNIs+dlT2DkY8PA XA== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 30p01nq43g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 28 Apr 2020 15:14:25 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03SFBtVD005476; Tue, 28 Apr 2020 15:14:24 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3020.oracle.com with ESMTP id 30mxx00yce-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 28 Apr 2020 15:14:24 +0000 Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 03SFENCX010588; Tue, 28 Apr 2020 15:14:23 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 28 Apr 2020 08:14:22 -0700 Date: Tue, 28 Apr 2020 08:14:20 -0700 From: "Darrick J. Wong" To: Christoph Hellwig Cc: linux-ext4@vger.kernel.org, viro@zeniv.linux.org.uk, jack@suse.cz, tytso@mit.edu, adilger@dilger.ca, riteshh@linux.ibm.com, amir73il@gmail.com, linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org Subject: Re: [PATCH 08/11] fs: move fiemap range validation into the file systems instances Message-ID: <20200428151420.GJ6741@magnolia> References: <20200427181957.1606257-1-hch@lst.de> <20200427181957.1606257-9-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200427181957.1606257-9-hch@lst.de> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9605 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004280120 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9605 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 clxscore=1015 phishscore=0 mlxlogscore=999 adultscore=0 priorityscore=1501 mlxscore=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004280120 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Mon, Apr 27, 2020 at 08:19:54PM +0200, Christoph Hellwig wrote: > Replace fiemap_check_flags with a fiemap_validate helpers that also takes "...with a fiemap_prep helper..." ? (new to this patchset, confused) --D > the inode and mapped range, and performs the sanity check and truncation > previously done in fiemap_check_range. This way the validation is inside > the file system itself and thus properly works for the stacked overlayfs > case as well. > > Signed-off-by: Christoph Hellwig > --- > Documentation/filesystems/fiemap.txt | 8 ++--- > fs/btrfs/inode.c | 2 +- > fs/cifs/smb2ops.c | 6 ++-- > fs/ext4/extents.c | 5 +-- > fs/f2fs/data.c | 3 +- > fs/ioctl.c | 53 +++++++++++----------------- > fs/iomap/fiemap.c | 2 +- > fs/nilfs2/inode.c | 2 +- > fs/ocfs2/extent_map.c | 3 +- > include/linux/fiemap.h | 3 +- > 10 files changed, 40 insertions(+), 47 deletions(-) > > diff --git a/Documentation/filesystems/fiemap.txt b/Documentation/filesystems/fiemap.txt > index ac87e6fda842b..05926b7f92809 100644 > --- a/Documentation/filesystems/fiemap.txt > +++ b/Documentation/filesystems/fiemap.txt > @@ -203,15 +203,13 @@ EINTR once fatal signal received. > > > Flag checking should be done at the beginning of the ->fiemap callback via the > -fiemap_check_flags() helper: > - > -int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags); > +fiemap_prep() helper. > > The struct fieinfo should be passed in as received from ioctl_fiemap(). The > set of fiemap flags which the fs understands should be passed via fs_flags. If > -fiemap_check_flags finds invalid user flags, it will place the bad values in > +fiemap_prep finds invalid user flags, it will place the bad values in > fieinfo->fi_flags and return -EBADR. If the file system gets -EBADR, from > -fiemap_check_flags(), it should immediately exit, returning that error back to > +fiemap_prep(), it should immediately exit, returning that error back to > ioctl_fiemap(). > > > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index 320d1062068d3..1f1ec361089b3 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -8250,7 +8250,7 @@ static int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, > { > int ret; > > - ret = fiemap_check_flags(fieinfo, BTRFS_FIEMAP_FLAGS); > + ret = fiemap_prep(inode, fieinfo, start, &len, BTRFS_FIEMAP_FLAGS); > if (ret) > return ret; > > diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c > index 09047f1ddfb66..8a2e94931dc96 100644 > --- a/fs/cifs/smb2ops.c > +++ b/fs/cifs/smb2ops.c > @@ -3408,8 +3408,10 @@ static int smb3_fiemap(struct cifs_tcon *tcon, > int i, num, rc, flags, last_blob; > u64 next; > > - if (fiemap_check_flags(fei, FIEMAP_FLAG_SYNC)) > - return -EBADR; > + rc = fiemap_prep(cfile->dentry->d_inode, fei, start, &len, > + FIEMAP_FLAG_SYNC); > + if (rc) > + rc; > > xid = get_xid(); > again: > diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c > index a41ae7c510170..41f73dea92cac 100644 > --- a/fs/ext4/extents.c > +++ b/fs/ext4/extents.c > @@ -4908,8 +4908,9 @@ int ext4_get_es_cache(struct inode *inode, struct fiemap_extent_info *fieinfo, > fieinfo->fi_flags &= ~FIEMAP_FLAG_CACHE; > } > > - if (fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC)) > - return -EBADR; > + error = fiemap_prep(inode, fieinfo, start, &len, FIEMAP_FLAG_SYNC); > + if (error) > + return error; > > error = ext4_fiemap_check_ranges(inode, start, &len); > if (error) > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c > index 25abbbb65ba09..03faafc591b17 100644 > --- a/fs/f2fs/data.c > +++ b/fs/f2fs/data.c > @@ -1825,7 +1825,8 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, > return ret; > } > > - ret = fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR); > + ret = fiemap_prep(inode, fieinfo, start, &len, > + FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR); > if (ret) > return ret; > > diff --git a/fs/ioctl.c b/fs/ioctl.c > index cbc84e23d00bd..4d94c20c9596b 100644 > --- a/fs/ioctl.c > +++ b/fs/ioctl.c > @@ -141,9 +141,12 @@ int fiemap_fill_next_extent(struct fiemap_extent_info *fieinfo, u64 logical, > EXPORT_SYMBOL(fiemap_fill_next_extent); > > /** > - * fiemap_check_flags - check validity of requested flags for fiemap > + * fiemap_prep - check validity of requested flags for fiemap > + * @inode: Inode to operate on > * @fieinfo: Fiemap context passed into ->fiemap > - * @fs_flags: Set of fiemap flags that the file system understands > + * @start: Start of the mapped range > + * @len: Length of the mapped range, can be truncated by this function. > + * @supported_flags: Set of fiemap flags that the file system understands > * > * Called from file system ->fiemap callback. This will compute the > * intersection of valid fiemap flags and those that the fs supports. That > @@ -154,48 +157,38 @@ EXPORT_SYMBOL(fiemap_fill_next_extent); > * > * Returns 0 on success, -EBADR on bad flags. > */ > -int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags) > +int fiemap_prep(struct inode *inode, struct fiemap_extent_info *fieinfo, > + u64 start, u64 *len, u32 supported_flags) > { > + u64 maxbytes = inode->i_sb->s_maxbytes; > u32 incompat_flags; > > - incompat_flags = fieinfo->fi_flags & ~(FIEMAP_FLAGS_COMPAT & fs_flags); > - if (incompat_flags) { > - fieinfo->fi_flags = incompat_flags; > - return -EBADR; > - } > - return 0; > -} > -EXPORT_SYMBOL(fiemap_check_flags); > - > -static int fiemap_check_ranges(struct super_block *sb, > - u64 start, u64 len, u64 *new_len) > -{ > - u64 maxbytes = (u64) sb->s_maxbytes; > - > - *new_len = len; > - > - if (len == 0) > + if (*len == 0) > return -EINVAL; > - > if (start > maxbytes) > return -EFBIG; > > /* > * Shrink request scope to what the fs can actually handle. > */ > - if (len > maxbytes || (maxbytes - len) < start) > - *new_len = maxbytes - start; > + if (*len > maxbytes || (maxbytes - *len) < start) > + *len = maxbytes - start; > > + supported_flags &= FIEMAP_FLAGS_COMPAT; > + incompat_flags = fieinfo->fi_flags & ~supported_flags; > + if (incompat_flags) { > + fieinfo->fi_flags = incompat_flags; > + return -EBADR; > + } > return 0; > } > +EXPORT_SYMBOL(fiemap_prep); > > static int ioctl_fiemap(struct file *filp, struct fiemap __user *ufiemap) > { > struct fiemap fiemap; > struct fiemap_extent_info fieinfo = { 0, }; > struct inode *inode = file_inode(filp); > - struct super_block *sb = inode->i_sb; > - u64 len; > int error; > > if (!inode->i_op->fiemap) > @@ -207,11 +200,6 @@ static int ioctl_fiemap(struct file *filp, struct fiemap __user *ufiemap) > if (fiemap.fm_extent_count > FIEMAP_MAX_EXTENTS) > return -EINVAL; > > - error = fiemap_check_ranges(sb, fiemap.fm_start, fiemap.fm_length, > - &len); > - if (error) > - return error; > - > fieinfo.fi_flags = fiemap.fm_flags; > fieinfo.fi_extents_max = fiemap.fm_extent_count; > fieinfo.fi_extents_start = ufiemap->fm_extents; > @@ -224,7 +212,8 @@ static int ioctl_fiemap(struct file *filp, struct fiemap __user *ufiemap) > if (fieinfo.fi_flags & FIEMAP_FLAG_SYNC) > filemap_write_and_wait(inode->i_mapping); > > - error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, len); > + error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, > + fiemap.fm_length); > fiemap.fm_flags = fieinfo.fi_flags; > fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped; > if (copy_to_user(ufiemap, &fiemap, sizeof(fiemap))) > @@ -312,7 +301,7 @@ static int __generic_block_fiemap(struct inode *inode, > bool past_eof = false, whole_file = false; > int ret = 0; > > - ret = fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC); > + ret = fiemap_prep(inode, fieinfo, start, &len, FIEMAP_FLAG_SYNC); > if (ret) > return ret; > > diff --git a/fs/iomap/fiemap.c b/fs/iomap/fiemap.c > index dd04e4added15..5e4e3520424da 100644 > --- a/fs/iomap/fiemap.c > +++ b/fs/iomap/fiemap.c > @@ -75,7 +75,7 @@ int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi, > ctx.fi = fi; > ctx.prev.type = IOMAP_HOLE; > > - ret = fiemap_check_flags(fi, FIEMAP_FLAG_SYNC); > + ret = fiemap_prep(inode, fi, start, &len, FIEMAP_FLAG_SYNC); > if (ret) > return ret; > > diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c > index 6e1aca38931f3..052c2da11e4d7 100644 > --- a/fs/nilfs2/inode.c > +++ b/fs/nilfs2/inode.c > @@ -1006,7 +1006,7 @@ int nilfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, > unsigned int blkbits = inode->i_blkbits; > int ret, n; > > - ret = fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC); > + ret = fiemap_prep(inode, fieinfo, start, &len, FIEMAP_FLAG_SYNC); > if (ret) > return ret; > > diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c > index e3e2d1b2af51a..3744179b73fa1 100644 > --- a/fs/ocfs2/extent_map.c > +++ b/fs/ocfs2/extent_map.c > @@ -746,7 +746,8 @@ int ocfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, > struct buffer_head *di_bh = NULL; > struct ocfs2_extent_rec rec; > > - ret = fiemap_check_flags(fieinfo, OCFS2_FIEMAP_FLAGS); > + ret = fiemap_prep(inode, fieinfo, map_start, &map_len, > + OCFS2_FIEMAP_FLAGS); > if (ret) > return ret; > > diff --git a/include/linux/fiemap.h b/include/linux/fiemap.h > index 240d4f7d9116a..4e624c4665837 100644 > --- a/include/linux/fiemap.h > +++ b/include/linux/fiemap.h > @@ -13,9 +13,10 @@ struct fiemap_extent_info { > fiemap_extent array */ > }; > > +int fiemap_prep(struct inode *inode, struct fiemap_extent_info *fieinfo, > + u64 start, u64 *len, u32 supported_flags); > int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical, > u64 phys, u64 len, u32 flags); > -int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags); > > int generic_block_fiemap(struct inode *inode, > struct fiemap_extent_info *fieinfo, u64 start, u64 len, > -- > 2.26.1 >