diff options
| author | Zhihao Cheng <chengzhihao1@huawei.com> | 2023-03-01 20:29:18 +0800 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2023-04-23 23:36:19 +0200 |
| commit | 7d01cb27f6aebc54efbe28d8961a973b8f795b13 (patch) | |
| tree | 5c8c077e9ea85e77dfbb09fae7ab37f26b3f622b /fs/ubifs | |
| parent | 3a36d20e012903f45714df2731261fdefac900cb (diff) | |
| download | linux-7d01cb27f6aebc54efbe28d8961a973b8f795b13.tar.gz | |
Revert "ubifs: dirty_cow_znode: Fix memleak in error handling path"
This reverts commit 122deabfe1428 (ubifs: dirty_cow_znode: Fix memleak
in error handling path).
After commit 122deabfe1428 applied, if insert_old_idx() failed, old
index neither exists in TNC nor in old-index tree. Which means that
old index node could be overwritten in layout_leb_in_gaps(), then
ubifs image will be corrupted in power-cut.
Fixes: 122deabfe1428 (ubifs: dirty_cow_znode: Fix memleak ... path)
Cc: stable@vger.kernel.org
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/tnc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 2469f72eeaab..2df56bbc6865 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -267,18 +267,11 @@ static struct ubifs_znode *dirty_cow_znode(struct ubifs_info *c, if (zbr->len) { err = insert_old_idx(c, zbr->lnum, zbr->offs); if (unlikely(err)) - /* - * Obsolete znodes will be freed by tnc_destroy_cnext() - * or free_obsolete_znodes(), copied up znodes should - * be added back to tnc and freed by - * ubifs_destroy_tnc_subtree(). - */ - goto out; + return ERR_PTR(err); err = add_idx_dirt(c, zbr->lnum, zbr->len); } else err = 0; -out: zbr->znode = zn; zbr->lnum = 0; zbr->offs = 0; |