From patchwork Tue Dec 3 22:36:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 180739 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2145772ile; Tue, 3 Dec 2019 14:39:00 -0800 (PST) X-Google-Smtp-Source: APXvYqxyvD3FtLBTVvgT5f87YqPMLX+xruOAkPkenpaVijETOPAtg/tUMgMBVJg4mK20RWBxvRdB X-Received: by 2002:aca:3a41:: with SMTP id h62mr290616oia.97.1575412739862; Tue, 03 Dec 2019 14:38:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575412739; cv=none; d=google.com; s=arc-20160816; b=piH5UR+3mQWofngGoI09zIhPCXL9Fi6XKuE5pKE/sa9Ds/4cTP3Blj0Ne2oarbSurU ncy3SL0sxp5n1u+z/q+crLVg890GTQNoQMxglmPFmyig44a2F/vgO5wy0dGUti4N7viH kqVRfqL++p79ZQHuPsj6deSLxBg9k67VhE+V7qyEfhxYGAaILtKn7pBfRbEWXRT6Tysa NUJVpVoYvmlm4OEuImbiNiGpEPpryjNpPjHTnJ9nRbzzJLnEXMtymWSZpD/314RBWQM8 YCChgSx/Cz/acs20eBkGkHOXxLK8DczMPbO4OGSKx3ge5cQ8aCIec3iMqADvdndsaMOe +9kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=h+5yu8PdyKq2qcJE7+OZMyrHu1gZ11NDzKTBtS9wBrU=; b=scHv4dnXiSvFC2HzhhSSJJCaF2rKXr3OzzZgKeXQ9FprtB+EjUVDK65pcENmPdmB2g S7NbfLG57uKgflgpS9E10EpXAYohVqcApLMsiL3oLJ8Bs8CGn0ISzu2Aw7C+N4hrJtac DIZleddF52a6vY2FyDaEDWTZUXVm14wjbFFL5tal3IwxMsOiP7FpgoSgCGbMImGTYOOo SWX5QDSWMJcNdWH5vHgyp9rFl2OLHpWaX4EopXwSosB4SAJjUi8uZ7A0lmFNWETqaapr Z4sF10Gfw9xIeNNNwdTGV3RCL/kmX0fdd31L36I+KzMzSeG5ozZwoJwlnqxAyQmsROKO +Ckw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="X/jGHXz7"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z18si2082441otq.121.2019.12.03.14.38.59; Tue, 03 Dec 2019 14:38:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="X/jGHXz7"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728108AbfLCWi6 (ORCPT + 27 others); Tue, 3 Dec 2019 17:38:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:48600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728097AbfLCWiz (ORCPT ); Tue, 3 Dec 2019 17:38:55 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6A6BB20863; Tue, 3 Dec 2019 22:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575412734; bh=IC6o68mrLdx4mysFXDFXgdZP+YGES3DYn46twtdjoEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X/jGHXz7Tkrc/xgNH9cAEX1HqNIZ4NsgPzzwZ7KELSwIQCudpTkNUQPgfV9XMjL32 bUNx7Tnjv0JXshuHArqBKYTpWdBJIId8Qt8n5C/sZoUz3XoVG2XtfLpO7Cck38HFE2 zPlvjD+BkuIsMKTDhQBJ15EIdVR3nRzpoGMHI+A4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hou Tao , Joel Stanley , Richard Weinberger Subject: [PATCH 5.4 42/46] Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()" Date: Tue, 3 Dec 2019 23:36:02 +0100 Message-Id: <20191203212805.427358245@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203212705.175425505@linuxfoundation.org> References: <20191203212705.175425505@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joel Stanley commit 6e78c01fde9023e0701f3af880c1fd9de6e4e8e3 upstream. 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 Signed-off-by: Joel Stanley Signed-off-by: Richard Weinberger Signed-off-by: Greg Kroah-Hartman --- fs/jffs2/nodelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/jffs2/nodelist.c +++ b/fs/jffs2/nodelist.c @@ -226,7 +226,7 @@ static int jffs2_add_frag_to_fragtree(st 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 */