leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: Check for extent overflow when adding dir entries

Browse Source 
Directory entry addition can cause the following,
1. Data block can be added/removed.
   A new extent can cause extent count to increase by 1.
2. Free disk block can be added/removed.
   Same behaviour as described above for Data block.
3. Dabtree blocks.
   XFS_DA_NODE_MAXDEPTH blocks can be added. Each of these
   can be new extents. Hence extent count can increase by
   XFS_DA_NODE_MAXDEPTH.

Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Chandan Babu R 2021-01-22 16:48:12 -08:00 committed by Darrick J. Wong
parent 85ef08b5a6
commit f5d9274919
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/xfs/libxfs/xfs_inode_fork.h
View File

@ -47,6 +47,19 @@ struct xfs_ifork {
*/ */
#define XFS_IEXT_PUNCH_HOLE_CNT (1) #define XFS_IEXT_PUNCH_HOLE_CNT (1)
/*
* Directory entry addition can cause the following,
* 1. Data block can be added/removed.
* A new extent can cause extent count to increase by 1.
* 2. Free disk block can be added/removed.
* Same behaviour as described above for Data block.
* 3. Dabtree blocks.
* XFS_DA_NODE_MAXDEPTH blocks can be added. Each of these can be new
* extents. Hence extent count can increase by XFS_DA_NODE_MAXDEPTH.
*/
#define XFS_IEXT_DIR_MANIP_CNT(mp) \
((XFS_DA_NODE_MAXDEPTH + 1 + 1) * (mp)->m_dir_geo->fsbcount)
/* /*
* Fork handling. * Fork handling.
*/ */

10
fs/xfs/xfs_inode.c
View File

@ -1042,6 +1042,11 @@ xfs_create(
if (error) if (error)
goto out_trans_cancel; goto out_trans_cancel;
error = xfs_iext_count_may_overflow(dp, XFS_DATA_FORK,
XFS_IEXT_DIR_MANIP_CNT(mp));
if (error)
goto out_trans_cancel;
/* /*
* A newly created regular or special file just has one directory * A newly created regular or special file just has one directory
* entry pointing to them, but a directory also the "." entry * entry pointing to them, but a directory also the "." entry
@ -1258,6 +1263,11 @@ xfs_link(
xfs_trans_ijoin(tp, sip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, sip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, tdp, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, tdp, XFS_ILOCK_EXCL);
error = xfs_iext_count_may_overflow(tdp, XFS_DATA_FORK,
XFS_IEXT_DIR_MANIP_CNT(mp));
if (error)
goto error_return;
/* /*
* If we are using project inheritance, we only allow hard link * If we are using project inheritance, we only allow hard link
* creation in our tree when the project IDs are the same; else * creation in our tree when the project IDs are the same; else

5
fs/xfs/xfs_symlink.c
View File

@ -220,6 +220,11 @@ xfs_symlink(
if (error) if (error)
goto out_trans_cancel; goto out_trans_cancel;
error = xfs_iext_count_may_overflow(dp, XFS_DATA_FORK,
XFS_IEXT_DIR_MANIP_CNT(mp));
if (error)
goto out_trans_cancel;
/* /*
* Allocate an inode for the symlink. * Allocate an inode for the symlink.
*/ */