From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 02 Oct 2024 18:08:12 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sw1tb-005Quy-0C for lore@lore.pengutronix.de; Wed, 02 Oct 2024 18:08:12 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sw1tb-0003Ue-Hz for lore@pengutronix.de; Wed, 02 Oct 2024 18:08:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=fHYHQWHYSE5oHnsYVd/hWOpFUz3GVrLrMlJ2PDrOhlw=; b=S/vdoFMeM/xEdLgsS1zJrcGBhr fCad+vg68lL1CF9xLAVltV7ButSTE4nTMkbgLk1VpLCLLCtna2/ZkxPUTxjvZlc2y3cr51QBhO4p1 72fEmpQaaW/L4V7v69IqrwYSpx0Ewa1DhyFyHIwNrTwQeBxTRhMpFsmcC5HWuURGqw2kq56/t3WXc cGx8D8tpn8f020GeQFbsFb+b5/gYWEXWnu16GmQJRNJ0TwAteLoFmBdu118fE7FEG8pGcxrwZY6iW 48+d1WzCa1YmVeL+23juuUiHKsECPAy2wYLy7V78pE7uTBGTrWxZj7PXzAlpU8XNuynDFCUgvNzkt oVLvGRbw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1sw1sy-00000006r71-3aDo; Wed, 02 Oct 2024 16:07:32 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1sw1sv-00000006r65-16hC for barebox@lists.infradead.org; Wed, 02 Oct 2024 16:07:30 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sw1sr-0003QD-EL; Wed, 02 Oct 2024 18:07:25 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sw1sr-00393H-1m; Wed, 02 Oct 2024 18:07:25 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1sw1sq-00AAZQ-35; Wed, 02 Oct 2024 18:07:25 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Rashidwi , Ahmad Fatoum Date: Wed, 2 Oct 2024 18:07:15 +0200 Message-Id: <20241002160714.2423842-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241002_090729_320735_08AA29D0 X-CRM114-Status: GOOD ( 10.83 ) 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: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::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.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 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: [PATCH] uimage: fix CRC32 verification on NFS X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Reading a file over NFS is prone to return short reads as the file content is split over multiple UDP packets and reads won't return more than the number of bytes that have gathered in the FIFO. The uImage verification code didn't account for this and handled neither short reads or the file prematurely ending. Address both to fix this unexpected result: uimage -v /mnt/nfs/uImage verifying data CRC... Bad Data CRC: 0x56474aa2 != 0x6b8f0a9c cp /mnt/nfs/uImage . uimage -v uImage verifying data CRC... ok Fixes: 390249968c4e ("reimplement uImage code") Closes: https://github.com/barebox/barebox/issues/28 Reported-by: Rashidwi Signed-off-by: Ahmad Fatoum --- common/uimage.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/uimage.c b/common/uimage.c index 140a08c1e426..c578edae2606 100644 --- a/common/uimage.c +++ b/common/uimage.c @@ -272,7 +272,9 @@ int uimage_verify(struct uimage_handle *handle) ret = read(handle->fd, buf, now); if (ret < 0) goto err; - crc = crc32(crc, buf, now); + if (!ret) + break; + crc = crc32(crc, buf, ret); len -= ret; } -- 2.39.5