public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Chandan Babu R <chandanrlinux@gmail.com>
To: linux-xfs@vger.kernel.org
Cc: Chandan Babu R <chandanrlinux@gmail.com>,
	djwong@kernel.org, hch@lst.de, allison.henderson@oracle.com,
	"Darrick J . Wong" <darrick.wong@oracle.com>
Subject: [PATCH V15 04/16] xfs: Check for extent overflow when adding dir entries
Date: Tue, 26 Jan 2021 12:02:20 +0530	[thread overview]
Message-ID: <20210126063232.3648053-5-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20210126063232.3648053-1-chandanrlinux@gmail.com>

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.

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
---
 fs/xfs/libxfs/xfs_inode_fork.h | 13 +++++++++++++
 fs/xfs/xfs_inode.c             | 10 ++++++++++
 fs/xfs/xfs_symlink.c           |  5 +++++
 3 files changed, 28 insertions(+)

diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
index bcac769a7df6..ea1a9dd8a763 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.h
+++ b/fs/xfs/libxfs/xfs_inode_fork.h
@@ -47,6 +47,19 @@ struct xfs_ifork {
  */
 #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.
  */
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index b7352bc4c815..4cc787cc4eee 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1042,6 +1042,11 @@ xfs_create(
 	if (error)
 		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
 	 * 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, 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
 	 * creation in our tree when the project IDs are the same; else
diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c
index 1f43fd7f3209..0b8136a32484 100644
--- a/fs/xfs/xfs_symlink.c
+++ b/fs/xfs/xfs_symlink.c
@@ -220,6 +220,11 @@ xfs_symlink(
 	if (error)
 		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.
 	 */
-- 
2.29.2


  parent reply	other threads:[~2021-01-26 17:24 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-26  6:32 [PATCH V15 00/16] Bail out if transaction can cause extent count to overflow Chandan Babu R
2021-01-26  6:32 ` [PATCH V15 01/16] xfs: Add helper for checking per-inode extent count overflow Chandan Babu R
2021-01-26  6:32 ` [PATCH V15 02/16] xfs: Check for extent overflow when trivally adding a new extent Chandan Babu R
2021-01-26  6:32 ` [PATCH V15 03/16] xfs: Check for extent overflow when punching a hole Chandan Babu R
2021-01-26  6:32 ` Chandan Babu R [this message]
2021-01-27  0:39   ` [PATCH V15 04/16] xfs: Check for extent overflow when adding dir entries Allison Henderson
2021-01-26  6:32 ` [PATCH V15 05/16] xfs: Check for extent overflow when removing " Chandan Babu R
2021-01-27  0:39   ` Allison Henderson
2021-01-26  6:32 ` [PATCH V15 06/16] xfs: Check for extent overflow when renaming " Chandan Babu R
2021-01-27  0:39   ` Allison Henderson
2021-01-26  6:32 ` [PATCH V15 07/16] xfs: Check for extent overflow when adding/removing xattrs Chandan Babu R
2021-01-26  6:32 ` [PATCH V15 08/16] xfs: Check for extent overflow when writing to unwritten extent Chandan Babu R
2021-01-26  6:32 ` [PATCH V15 09/16] xfs: Check for extent overflow when moving extent from cow to data fork Chandan Babu R
2021-01-26  6:32 ` [PATCH V15 10/16] xfs: Check for extent overflow when remapping an extent Chandan Babu R
2021-01-26  6:32 ` [PATCH V15 11/16] xfs: Check for extent overflow when swapping extents Chandan Babu R
2021-01-26  6:32 ` [PATCH V15 12/16] xfs: Introduce error injection to reduce maximum inode fork extent count Chandan Babu R
2021-01-26  6:32 ` [PATCH V15 13/16] xfs: Remove duplicate assert statement in xfs_bmap_btalloc() Chandan Babu R
2021-01-26  6:32 ` [PATCH V15 14/16] xfs: Compute bmap extent alignments in a separate function Chandan Babu R
2021-01-27  0:39   ` Allison Henderson
2021-01-26  6:32 ` [PATCH V15 15/16] xfs: Process allocated extent " Chandan Babu R
2021-01-26  6:32 ` [PATCH V15 16/16] xfs: Introduce error injection to allocate only minlen size extents for files Chandan Babu R
2021-01-28  2:35   ` Allison Henderson
2021-01-26 18:00 ` [PATCH V15 00/16] Bail out if transaction can cause extent count to overflow Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210126063232.3648053-5-chandanrlinux@gmail.com \
    --to=chandanrlinux@gmail.com \
    --cc=allison.henderson@oracle.com \
    --cc=darrick.wong@oracle.com \
    --cc=djwong@kernel.org \
    --cc=hch@lst.de \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox