On 12 February 2016 at 13:57, Marek Vasut <[email protected]> wrote: > On 02/12/2016 09:56 PM, Stephen Warren wrote: >> From: Stephen Warren <[email protected]> >> >> The alignment and size were swapped, leading to malloc heap corruption. >> >> On my system, this sometimes caused U-Boot to crash during or after >> certain USB Ethernet operations. >> >> Fixes: c8c2797c3810 ("dm: usb: eth: Support driver model with USB Ethernet") >> Signed-off-by: Stephen Warren <[email protected]> > > Oh this is a nice catch! > > Acked-by: Marek Vasut <[email protected]> > >> --- >> drivers/usb/eth/usb_ether.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c >> index b9c9a8402e39..36734e2e51b3 100644 >> --- a/drivers/usb/eth/usb_ether.c >> +++ b/drivers/usb/eth/usb_ether.c >> @@ -73,7 +73,7 @@ int usb_ether_register(struct udevice *dev, struct >> ueth_data *ueth, int rxsize) >> } >> >> ueth->rxsize = rxsize; >> - ueth->rxbuf = memalign(rxsize, ARCH_DMA_MINALIGN); >> + ueth->rxbuf = memalign(ARCH_DMA_MINALIGN, rxsize); >> if (!ueth->rxbuf) >> return -ENOMEM; >> >> >
Oh dear. For some reason I thought that was fixed. But I see from this thread that it did not fix the problem at the time and I didn't send a patch either: http://lists.denx.de/pipermail/u-boot/2015-August/222440.html Reviewed-by: Simon Glass <[email protected]> Thanks Stephen for finding this and actually fixing it :-) - Simon _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
