mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: libaokun@huaweicloud.com
To: linux-ext4@vger.kernel.org
Cc: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz,
	ritesh.list@gmail.com, linux-kernel@vger.kernel.org,
	yi.zhang@huawei.com, yangerkun@huawei.com,
	libaokun@huaweicloud.com, Baokun Li <libaokun1@huawei.com>,
	stable@kernel.org
Subject: [PATCH 07/20] ext4: drop ppath from ext4_ext_replay_update_ex() to avoid double-free
Date: Wed, 10 Jul 2024 12:06:41 +0800	[thread overview]
Message-ID: <20240710040654.1714672-8-libaokun@huaweicloud.com> (raw)
In-Reply-To: <20240710040654.1714672-1-libaokun@huaweicloud.com>

From: Baokun Li <libaokun1@huawei.com>

When calling ext4_force_split_extent_at() in ext4_ext_replay_update_ex(),
the 'ppath' is updated but it is the 'path' that is freed, thus potentially
triggering a double-free in the following process:

ext4_ext_replay_update_ex
  ppath = path
  ext4_force_split_extent_at(&ppath)
    ext4_split_extent_at
      ext4_ext_insert_extent
        ext4_ext_create_new_leaf
          ext4_ext_grow_indepth
            ext4_find_extent
              if (depth > path[0].p_maxdepth)
                kfree(path)                 ---> path First freed
                *orig_path = path = NULL    ---> null ppath
  kfree(path)                               ---> path double-free !!!

So drop the unnecessary ppath and use path directly to avoid this problem.
And use ext4_find_extent() directly to update path, avoiding unnecessary
memory allocation and freeing. Also, propagate the error returned by
ext4_find_extent() instead of using strange error codes.

Fixes: 8016e29f4362 ("ext4: fast commit recovery path")
Cc: stable@kernel.org
Signed-off-by: Baokun Li <libaokun1@huawei.com>
---
 fs/ext4/extents.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 1660434fbfc7..b1cfce5b57d2 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -5920,7 +5920,7 @@ int ext4_clu_mapped(struct inode *inode, ext4_lblk_t lclu)
 int ext4_ext_replay_update_ex(struct inode *inode, ext4_lblk_t start,
 			      int len, int unwritten, ext4_fsblk_t pblk)
 {
-	struct ext4_ext_path *path = NULL, *ppath;
+	struct ext4_ext_path *path;
 	struct ext4_extent *ex;
 	int ret;
 
@@ -5936,30 +5936,29 @@ int ext4_ext_replay_update_ex(struct inode *inode, ext4_lblk_t start,
 	if (le32_to_cpu(ex->ee_block) != start ||
 		ext4_ext_get_actual_len(ex) != len) {
 		/* We need to split this extent to match our extent first */
-		ppath = path;
 		down_write(&EXT4_I(inode)->i_data_sem);
-		ret = ext4_force_split_extent_at(NULL, inode, &ppath, start, 1);
+		ret = ext4_force_split_extent_at(NULL, inode, &path, start, 1);
 		up_write(&EXT4_I(inode)->i_data_sem);
 		if (ret)
 			goto out;
-		kfree(path);
-		path = ext4_find_extent(inode, start, NULL, 0);
+
+		path = ext4_find_extent(inode, start, &path, 0);
 		if (IS_ERR(path))
-			return -1;
-		ppath = path;
+			return PTR_ERR(path);
 		ex = path[path->p_depth].p_ext;
 		WARN_ON(le32_to_cpu(ex->ee_block) != start);
+
 		if (ext4_ext_get_actual_len(ex) != len) {
 			down_write(&EXT4_I(inode)->i_data_sem);
-			ret = ext4_force_split_extent_at(NULL, inode, &ppath,
+			ret = ext4_force_split_extent_at(NULL, inode, &path,
 							 start + len, 1);
 			up_write(&EXT4_I(inode)->i_data_sem);
 			if (ret)
 				goto out;
-			kfree(path);
-			path = ext4_find_extent(inode, start, NULL, 0);
+
+			path = ext4_find_extent(inode, start, &path, 0);
 			if (IS_ERR(path))
-				return -EINVAL;
+				return PTR_ERR(path);
 			ex = path[path->p_depth].p_ext;
 		}
 	}
-- 
2.39.2


  parent reply	other threads:[~2024-07-10  4:09 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-10  4:06 [PATCH 00/20] ext4: some bugfixes and cleanups for ext4 extents path libaokun
2024-07-10  4:06 ` [PATCH 01/20] ext4: refactor ext4_ext_rm_idx() to index 'path' libaokun
2024-07-24 18:44   ` Jan Kara
2024-07-25  9:14   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 02/20] ext4: prevent partial update of the extents path libaokun
2024-07-14 15:42   ` Ojaswin Mujoo
2024-07-15 12:33     ` Baokun Li
2024-07-15 12:41       ` Baokun Li
2024-07-16  9:54         ` Ojaswin Mujoo
2024-07-16 11:54           ` Baokun Li
2024-07-17  5:29             ` Ojaswin Mujoo
2024-07-17  6:11               ` Baokun Li
2024-07-24  6:23                 ` Ojaswin Mujoo
2024-07-25  5:35                   ` Baokun Li
2024-07-25  8:48                     ` Ojaswin Mujoo
2024-07-24 18:53   ` Jan Kara
2024-07-10  4:06 ` [PATCH 03/20] ext4: fix double brelse() the buffer " libaokun
2024-07-24 19:01   ` Jan Kara
2024-07-26 11:45   ` Ojaswin Mujoo
2024-07-30  8:47     ` Baokun Li
2024-08-01  6:26       ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 04/20] ext4: add new ext4_ext_path_brelse() helper libaokun
2024-07-24 19:02   ` Jan Kara
2024-07-26 11:53   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 05/20] ext4: fix slab-use-after-free in ext4_split_extent_at() libaokun
2024-07-24 19:13   ` Jan Kara
2024-07-27 10:36   ` Ojaswin Mujoo
2024-07-30  8:57     ` Baokun Li
2024-07-30  9:26       ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 06/20] ext4: avoid use-after-free in ext4_ext_show_leaf() libaokun
2024-07-24 19:16   ` Jan Kara
2024-07-25  5:41     ` Baokun Li
2024-07-27 10:43   ` Ojaswin Mujoo
2024-07-10  4:06 ` libaokun [this message]
2024-07-25 10:31   ` [PATCH 07/20] ext4: drop ppath from ext4_ext_replay_update_ex() to avoid double-free Jan Kara
2024-07-27 11:18   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 08/20] ext4: get rid of ppath in ext4_find_extent() libaokun
2024-07-25 10:38   ` Jan Kara
2024-07-27  6:18     ` Baokun Li
2024-07-29 11:28       ` Jan Kara
2024-07-30 10:03   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 09/20] ext4: get rid of ppath in get_ext_path() libaokun
2024-07-25 10:41   ` Jan Kara
2024-08-01  7:16   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 10/20] ext4: get rid of ppath in ext4_ext_create_new_leaf() libaokun
2024-07-25 10:46   ` Jan Kara
2024-07-27  6:35     ` Baokun Li
2024-08-02  7:34   ` Ojaswin Mujoo
2024-08-02 13:07     ` Baokun Li
2024-07-10  4:06 ` [PATCH 11/20] ext4: get rid of ppath in ext4_ext_insert_extent() libaokun
2024-07-25 10:59   ` Jan Kara
2024-08-02  8:01   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 12/20] ext4: get rid of ppath in ext4_split_extent_at() libaokun
2024-07-25 11:07   ` Jan Kara
2024-07-27  6:42     ` Baokun Li
2024-08-21  3:19       ` Theodore Ts'o
2024-08-21  3:29         ` Baokun Li
2024-08-02  8:12   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 13/20] ext4: get rid of ppath in ext4_force_split_extent_at() libaokun
2024-07-25 11:14   ` Jan Kara
2024-08-02 20:01   ` Ojaswin Mujoo
2024-08-03  2:23     ` Baokun Li
2024-07-10  4:06 ` [PATCH 14/20] ext4: get rid of ppath in ext4_split_extent() libaokun
2024-07-25 12:07   ` Jan Kara
2024-08-02 20:17   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 15/20] ext4: get rid of ppath in ext4_split_convert_extents() libaokun
2024-07-25 12:12   ` Jan Kara
2024-08-02 20:26   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 16/20] ext4: get rid of ppath in ext4_convert_unwritten_extents_endio() libaokun
2024-07-25 12:14   ` Jan Kara
2024-08-02 20:28   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 17/20] ext4: get rid of ppath in ext4_ext_convert_to_initialized() libaokun
2024-07-25 12:18   ` Jan Kara
2024-08-02 20:38   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 18/20] ext4: get rid of ppath in ext4_ext_handle_unwritten_extents() libaokun
2024-07-25 12:22   ` Jan Kara
2024-08-02 20:44   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 19/20] ext4: get rid of ppath in convert_initialized_extent() libaokun
2024-07-25 12:23   ` Jan Kara
2024-08-02 20:46   ` Ojaswin Mujoo
2024-07-10  4:06 ` [PATCH 20/20] ext4: avoid unnecessary extent path frees and allocations libaokun
2024-07-25 12:31   ` Jan Kara
2024-08-02 20:58   ` Ojaswin Mujoo
2024-07-25  9:02 ` [PATCH 00/20] ext4: some bugfixes and cleanups for ext4 extents path Ojaswin Mujoo

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=20240710040654.1714672-8-libaokun@huaweicloud.com \
    --to=libaokun@huaweicloud.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=jack@suse.cz \
    --cc=libaokun1@huawei.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ritesh.list@gmail.com \
    --cc=stable@kernel.org \
    --cc=tytso@mit.edu \
    --cc=yangerkun@huawei.com \
    --cc=yi.zhang@huawei.com \
    /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

all inboxes | Powered by JetHome®