Re: [PATCH 2/2] iomap: constrain the file range passed to iomap_file_unshare

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, 2024-10-02 at 08:02 -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@xxxxxxxxxx>
> 
> File contents can only be shared (i.e. reflinked) below EOF, so it makes
> no sense to try to unshare ranges beyond EOF.  Constrain the file range
> parameters here so that we don't have to do that in the callers.
> 
> Fixes: 5f4e5752a8a3 ("fs: add iomap_file_dirty")
> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
> ---
>  fs/dax.c               |    6 +++++-
>  fs/iomap/buffered-io.c |    6 +++++-
>  2 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/dax.c b/fs/dax.c
> index becb4a6920c6a..c62acd2812f8d 100644
> --- a/fs/dax.c
> +++ b/fs/dax.c
> @@ -1305,11 +1305,15 @@ int dax_file_unshare(struct inode *inode, loff_t
> pos, loff_t len,
>         struct iomap_iter iter = {
>                 .inode          = inode,
>                 .pos            = pos,
> -               .len            = len,
>                 .flags          = IOMAP_WRITE | IOMAP_UNSHARE |
> IOMAP_DAX,
>         };
> +       loff_t size = i_size_read(inode);
>         int ret;
>  
> +       if (pos < 0 || pos >= size)
> +               return 0;
> +
> +       iter.len = min(len, size - pos);
>         while ((ret = iomap_iter(&iter, ops)) > 0)
>                 iter.processed = dax_unshare_iter(&iter);
>         return ret;
> diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
> index c1c559e0cc07c..78ebd265f4259 100644
> --- a/fs/iomap/buffered-io.c
> +++ b/fs/iomap/buffered-io.c
> @@ -1375,11 +1375,15 @@ iomap_file_unshare(struct inode *inode, loff_t
> pos, loff_t len,
>         struct iomap_iter iter = {
>                 .inode          = inode,
>                 .pos            = pos,
> -               .len            = len,
>                 .flags          = IOMAP_WRITE | IOMAP_UNSHARE,
>         };
> +       loff_t size = i_size_read(inode);
>         int ret;
>  
> +       if (pos < 0 || pos >= size)
> +               return 0;
> +
> +       iter.len = min(len, size - pos);
>         while ((ret = iomap_iter(&iter, ops)) > 0)
>                 iter.processed = iomap_unshare_iter(&iter);
>         return ret;

Sorry I didn’t update the patch sooner—I was planning to get to it after
wrapping up my week-long vacation... Anyway, thanks for the patch, it looks
great!

Thanks,
-- 
Julian Sun <sunjunchao2870@xxxxxxxxx>




[Index of Archives]     [Linux Ext4 Filesystem]     [Union Filesystem]     [Filesystem Testing]     [Ceph Users]     [Ecryptfs]     [NTFS 3]     [AutoFS]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux Cachefs]     [Reiser Filesystem]     [Linux RAID]     [NTFS 3]     [Samba]     [Device Mapper]     [CEPH Development]

  Powered by Linux