[LINUX PATCH 2/7] Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()"

[LINUX PATCH 2/7] Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()"

[Sai Krishna Potthuri]

From: Joel Stanley <joel@jms.id.au>

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>
Signed-off-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
---
 fs/jffs2/nodelist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 */
--
2.17.1

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

RE: [LINUX PATCH 2/7] Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()"

[Sai Krishna Potthuri]

Hi,

Sorry, Please ignore this.
I am pulling this patch for testing.

Regards
Sai Krishna

> -----Original Message-----
> From: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
> Sent: Friday, February 14, 2020 4:47 PM
> To: git-dev <git-dev@xilinx.com>
> Cc: Michal Simek <michals@xilinx.com>; Joel Stanley <joel@jms.id.au>;
> stable@vger.kernel.org; Richard Weinberger <richard@nod.at>; Sai Krishna
> Potthuri <lakshmis@xilinx.com>
> Subject: [LINUX PATCH 2/7] Revert "jffs2: Fix possible null-pointer dereferences
> in jffs2_add_frag_to_fragtree()"
> 
> From: Joel Stanley <joel@jms.id.au>
> 
> 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>
> Signed-off-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
> ---
>  fs/jffs2/nodelist.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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 */
> --
> 2.17.1