From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e6Wvv-00008G-Jz for barebox@lists.infradead.org; Mon, 23 Oct 2017 07:14:01 +0000 Date: Mon, 23 Oct 2017 09:13:34 +0200 From: Sascha Hauer Message-ID: <20171023071334.lu5u2sxvngjq6rpx@pengutronix.de> References: <20171020170056.10893-1-l.stach@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20171020170056.10893-1-l.stach@pengutronix.de> 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" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] arm: bootm: don't fall over if image is padded with less than 40 bytes To: Lucas Stach Cc: barebox@lists.infradead.org On Fri, Oct 20, 2017 at 07:00:56PM +0200, Lucas Stach wrote: > If the zImage has a padding, which is less than 40 bytes > (sizeof struct fdt_header) the amount of read bytes would be propagated > as an error code. Fix this by only propagating real errors and treating > failure to read less than the expected amount as no concatenated DT > being present. > > Signed-off-by: Lucas Stach > --- Applied, thanks Sascha > arch/arm/lib/bootm.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c > index 8068a53be0a5..25efb42541f9 100644 > --- a/arch/arm/lib/bootm.c > +++ b/arch/arm/lib/bootm.c > @@ -250,8 +250,10 @@ static int do_bootz_linux_fdt(int fd, struct image_data *data) > > header = &__header; > ret = read(fd, header, sizeof(*header)); > - if (ret < sizeof(*header)) > + if (ret < 0) > return ret; > + if (ret < sizeof(*header)) > + return -ENXIO; > > if (file_detect_type(header, sizeof(*header)) != filetype_oftree) > return -ENXIO; > -- > 2.11.0 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 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