Commit fbe5dac7 authored by Francisco Iglesias's avatar Francisco Iglesias Committed by Peter Maydell
Browse files

xilinx_spips: Correct usage of an uninitialized local variable 



Coverity found that the variable tx_rx in the function
xilinx_spips_flush_txfifo was being used uninitialized (CID 1383841). This
patch corrects this by always initializing tx_rx to zeros.

Signed-off-by: default avatarFrancisco Iglesias <frasse.iglesias@gmail.com>
Message-id: 20180124215708.30400-1-frasse.iglesias@gmail.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 02e57e1c

hw/ssi/xilinx_spips.c

+17 −1
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ 
#define SNOOP_NONE 0xEE

#define SNOOP_STRIPING 0



#define MIN_NUM_BUSSES 1

#define MAX_NUM_BUSSES 2



static inline int num_effective_busses(XilinxSPIPS *s)

{

    return (s->regs[R_LQSPI_CFG] & LQSPI_CFG_SEP_BUS &&
@@ -573,7 +576,7 @@ static void xilinx_spips_flush_txfifo(XilinxSPIPS *s) 
    for (;;) {

        int i;

        uint8_t tx = 0;

        uint8_t tx_rx[num_effective_busses(s)];

        uint8_t tx_rx[MAX_NUM_BUSSES] = { 0 };

        uint8_t dummy_cycles = 0;

        uint8_t addr_length;
@@ -1221,6 +1224,19 @@ static void xilinx_spips_realize(DeviceState *dev, Error **errp) 


    DB_PRINT_L(0, "realized spips\n");



    if (s->num_busses > MAX_NUM_BUSSES) {

        error_setg(errp,

                   "requested number of SPI busses %u exceeds maximum %d",

                   s->num_busses, MAX_NUM_BUSSES);

        return;

    }

    if (s->num_busses < MIN_NUM_BUSSES) {

        error_setg(errp,

                   "requested number of SPI busses %u is below minimum %d",

                   s->num_busses, MIN_NUM_BUSSES);

        return;

    }



    s->spi = g_new(SSIBus *, s->num_busses);

    for (i = 0; i < s->num_busses; ++i) {

        char bus_name[16];