From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 15 Dec 2021 10:58:09 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mxR33-007BIN-C1 for lore@lore.pengutronix.de; Wed, 15 Dec 2021 10:58:09 +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 1mxR31-0004sS-A2 for lore@pengutronix.de; Wed, 15 Dec 2021 10:58:08 +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:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=RQnSEqYrXb6Wl9r2BDU5K9fik3Bwl3VvhL5g9PqMz5U=; b=yXUbWEbxYXatGDJjRXd0z7o0EQ HVovIibiz9NVA2Hfm1+2q2jn2x3aMLVsqkTnOZDW9LWA62JgIXPxbwrkiCVGMnrMOCYjQuDqPSk9D ZAsi0C1IfkwhS9TyLrnFNtYWtHgrUOCPhZNSwVQ2pFQNB3nVrl+4NIxMT/XFqrir7jsd2pchhftki A4/0Da4261rprhKEIcp9GbWLgwFT0eUAdmtz8gJgonvGs5mKHPBCU3d6Gi/w+V7i/3LsWLt7PmRzP jBZMZbE42X6691xaF/8zIxZTvdU7uYBvWQpgxM3vgeLLJJ03tIw/w3vN/uUwPDH/+Q7QHeNJX+h1d gaWnhJoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxR0s-0001V3-CP; Wed, 15 Dec 2021 09:55:54 +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 1mxR0g-0001S5-ES for barebox@lists.infradead.org; Wed, 15 Dec 2021 09:55:44 +0000 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mxR0d-0004V6-9E; Wed, 15 Dec 2021 10:55:39 +0100 To: Holger Assmann , barebox@lists.infradead.org References: <20211215090855.752555-1-h.assmann@pengutronix.de> From: Ahmad Fatoum Message-ID: Date: Wed, 15 Dec 2021 10:55:39 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20211215090855.752555-1-h.assmann@pengutronix.de> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211215_015542_549361_BAC971C4 X-CRM114-Status: GOOD ( 29.80 ) 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=-5.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH v2] 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 15.12.21 10:08, 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 > Reviewed-by: Ahmad Fatoum > --- > > Changes v1 -> v2: > - removed stray spaces > - added review acknowledgement You missed Sascha's suggestion from last time. > > fs/jffs2/fs.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c > index 8f6625b6e5..1dfa0c92a5 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); > + > if (pos != jf->offset) { > ret = jffs2_read_inode_range(c, f, jf->buf, pos, > JFFS2_BLOCK_SIZE); > @@ -98,12 +101,13 @@ static int jffs2_read(struct device_d *_dev, FILE *f, void *buf, > /* Read till end of current block */ > ofs = f->pos % JFFS2_BLOCK_SIZE; > if (ofs) { > - ret = jffs2_get_block(jf, pos); > + ret = jffs2_get_block(jf, f->pos - ofs); /* Align down block */ > if (ret) > return ret; > > now = min(size, JFFS2_BLOCK_SIZE - ofs); > > + /* Complete block has been read, re-apply ofset now */ > memcpy(buf, jf->buf + ofs, now); > size -= now; > pos += now; > -- 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