From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 07 Dec 2021 09:55:30 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1muWG2-0006wL-0W for lore@lore.pengutronix.de; Tue, 07 Dec 2021 09:55:30 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1muVez-00020z-Sn for lore@pengutronix.de; Tue, 07 Dec 2021 09:17:14 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:From:In-Reply-To:MIME-Version: References:Message-ID:Subject:Cc:To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=xTElTptBfYITX1aRMQYBif4RMYqy3XYJX7LhwkrbpDg=; b=FDzTPZm9uForeUqY939ocvLbmI aoCQJ0Za04rr0HCpHGjjadEd79DFM03t4NSXjDroIAqb6ukzYH6SsAF1KlzkZlEeFnZgRFURcZS7V hTGtvtiFzJs4lK/Y3yEohca8CqnIhTGK+80X6vvUbL5FD/I9rnBPf3Fd+/5QUmThGuVClcgz9bG7s 1MgkFbErH+ktB4YtkZ9g/TH+TN0S2OLuEkw+w/PyEzpe6AI4xbKz/YgiokkdsFfdeayUdZGtswVvT uVNrhgcjjCm+T6Sb5jLZaiNGfXtZGEV3p2/CaOjv32thb0YXM5IjAs6qgRhrNm17vc1eapxnfz55A 2mzQkU4A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1muVdG-007RNE-0x; Tue, 07 Dec 2021 08:15:26 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1muVbj-007Qnl-GG for barebox@lists.infradead.org; Tue, 07 Dec 2021 08:13:53 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1muVbg-0001LW-6h; Tue, 07 Dec 2021 09:13:48 +0100 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1muVbf-0008Aa-Ti; Tue, 07 Dec 2021 09:13:47 +0100 Date: Tue, 7 Dec 2021 09:13:47 +0100 To: Holger Assmann Cc: barebox@lists.infradead.org, afa@pengutronix.de Message-ID: <20211207081347.GC28260@pengutronix.de> References: <20211202104837.3912925-1-h.assmann@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211202104837.3912925-1-h.assmann@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 09:13:06 up 292 days, 11:36, 141 users, load average: 0.05, 0.17, 0.22 User-Agent: Mutt/1.10.1 (2018-07-13) From: Sascha Hauer X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211207_001351_596935_93172B21 X-CRM114-Status: GOOD ( 30.18 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH] fs: jffs2: fix error when reading blocks with offset X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On Thu, Dec 02, 2021 at 11:48:37AM +0100, Holger Assmann wrote: > This bug resulted in a panic when trying to read a file partially with > an offset, e.g. when starting Linux. In such a case a header is loaded > by a separate call of jffs2_read(), which then copies only the first n > bytes out of the respective block. > When the remaining data of the block is then subsequently going to to be > read the system deviates in its behaviour from that under Linux by not > calling jffs2_read_inode_range() in a 4k-alignment, but with an offset. > > jffs2_read_inode_range() originates from the Linux jffs2 driver. When > being called with an offset it still reads 4096 bytes of data and > eventually returns fragments of two consecutive blocks. jffs2_read() > then reads this result whilst again applying the offset, therefore > returning faulty data. > > We fix that problem by calling jffs2_get_block() without an offset and > therefore reading the whole block. The offset is then applied when we > actually perform memcpy with the returned buffer. This fix might also > increase the performance since the respective block is likely to be > cached from the previous call. > > Signed-off-by: Holger Assmann > --- > fs/jffs2/fs.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c > index 1a2b443792..3d4cb98c97 100644 > --- a/fs/jffs2/fs.c > +++ b/fs/jffs2/fs.c > @@ -74,6 +74,9 @@ static int jffs2_get_block(struct jffs2_file *jf, unsigned int pos) > struct jffs2_inode_info *f = JFFS2_INODE_INFO(jf->inode); > int ret; > > + /* pos always has to be 4096 bytes aligned here */ > + WARN_ON(pos % 4096 != 0); This should be JFFS2_BLOCK_SIZE, right? Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox