[U-Boot] [RESEND PATCH v2 1/2] imx: mx7: fix potential overflow in imx_ddr_size()

[Marcel Ziswiler]

On Tue, 2018-10-16 at 10:37 +0200, Stefano Babic wrote:
> On 16/10/2018 10:25, Marcel Ziswiler wrote:
> > Hi Stefano
> > 
> > On Tue, 2018-10-16 at 10:06 +0200, Stefano Babic wrote:
> > > Hi Marcel,
> > > 
> > > On 16/10/2018 08:46, Marcel Ziswiler wrote:
> > > > From: Marcel Ziswiler <marcel.ziswiler at toradex.com>
> > > > 
> > > > The imx_ddr_size() function may overflow as it is possible to
> > > > kind
> > > > of
> > > > over provision the DDR controller. Fix this by capping it to 2
> > > > GB
> > > > which
> > > > is the maximum allowed size as per reference manual.
> > > > 
> > > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler at toradex.com>
> > > > Reviewed-by: Fabio Estevam <fabio.estevam at nxp.com>
> > > > 
> > > > ---
> > > > 
> > > > Changes in v2: None
> > > > 
> > > >  arch/arm/mach-imx/mx7/ddr.c | 4 ++++
> > > >  1 file changed, 4 insertions(+)
> > > > 
> > > > diff --git a/arch/arm/mach-imx/mx7/ddr.c b/arch/arm/mach-
> > > > imx/mx7/ddr.c
> > > > index f19aeb8042..9713835bf2 100644
> > > > --- a/arch/arm/mach-imx/mx7/ddr.c
> > > > +++ b/arch/arm/mach-imx/mx7/ddr.c
> > > > @@ -196,5 +196,9 @@ unsigned int imx_ddr_size(void)
> > > >  	if (field_val <= 29)
> > > >  		bits++;
> > > >  
> > > > +	/* cap to max 2 GB */
> > > > +	if (bits > 31)
> > > > +		bits = 31;
> > > > +
> > > >  	return 1 << bits;
> > > >  }
> > > > 
> > > 
> > > This is a good catch, thanks for it ! The two patches in V2 (the
> > > second
> > > for colibri) are already in my list. Does this mean that you want
> > > I
> > > drop
> > > "colibri_imx7: prime get_ram_size() using imx_ddr_size() " ?
> > 
> > No, no. I just resent both as I did not see any activity on it but
> > if
> > you already have them queued that's completely fine. Thanks!
> > 
> 
> Ah, ok - I had already applied the two patches and you see them on
> u-boot-imx. However, I have not sent a PR to Tom.

Ah, yeah. Sorry, I forgot to check there. Perfect!

> Regards,
> Stefano

Cheers

Marcel