Commit 6e78c01f authored Nov 29, 2019 by Joel Stanley Committed by Richard Weinberger Nov 29, 2019

Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()"



This reverts commit f2538f99. 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: f2538f99 ("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>

parent f9c34bb5

fs/jffs2/nodelist.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message