Commit 89f26e6b authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/arm/omap_gpmc: Avoid buffer overrun filling prefetch FIFO 



In fill_prefetch_fifo(), if the device we are reading from is 16 bit,
then we must not try to transfer an odd number of bytes into the FIFO.
This could otherwise have resulted in our overrunning the prefetch.fifo
array by one byte.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
parent 1a791721

hw/misc/omap_gpmc.c

+4 −0
Original line number Diff line number Diff line
@@ -242,6 +242,10 @@ static void fill_prefetch_fifo(struct omap_gpmc_s *s) 
    if (bytes > s->prefetch.count) {

        bytes = s->prefetch.count;

    }

    if (is16bit) {

        bytes &= ~1;

    }



    s->prefetch.count -= bytes;

    s->prefetch.fifopointer += bytes;

    fptr = 64 - s->prefetch.fifopointer;