diff options
| author |   Joel Stanley <joel@jms.id.au> | 2019-11-29 10:49:30 +1030 |
|---|---|---|
| committer |   Richard Weinberger <richard@nod.at> | 2019-11-29 11:29:58 +0100 |
| commit | 6e78c01fde9023e0701f3af880c1fd9de6e4e8e3 (patch) | |
| tree | c48beb1983641d8dff8a12c21ecffbddd4c139de /fs/jffs2 | |
| parent | ubi: Fix producing anchor PEBs (diff) | |
| download | linux-dev-6e78c01fde9023e0701f3af880c1fd9de6e4e8e3.tar.xz linux-dev-6e78c01fde9023e0701f3af880c1fd9de6e4e8e3.zip | |
Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()"
This reverts commit f2538f999345405f7d2e1194c0c8efa4e11f7b3a. The patch
stopped JFFS2 from being able to mount an existing filesystem with the
following errors:
jffs2: error: (77) jffs2_build_inode_fragtree: Add node to tree failed -22
jffs2: error: (77) jffs2_do_read_inode_internal: Failed to build final fragtree for inode #5377: error -22
Fixes: f2538f999345 ("jffs2: Fix possible null-pointer dereferences...")
Cc: stable@vger.kernel.org
Suggested-by: Hou Tao <houtao1@huawei.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/nodelist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c index 021a4a2190ee..b86c78d178c6 100644 --- a/fs/jffs2/nodelist.c +++ b/fs/jffs2/nodelist.c @@ -226,7 +226,7 @@ static int jffs2_add_frag_to_fragtree(struct jffs2_sb_info *c, struct rb_root *r lastend = this->ofs + this->size; } else { dbg_fragtree2("lookup gave no frag\n"); - return -EINVAL; + lastend = 0; } /* See if we ran off the end of the fragtree */ |