Commit 1857b9db authored by Mansour Ahmadi's avatar Mansour Ahmadi Committed by Philippe Mathieu-Daudé
Browse files

hw/block/pflash: Check return value of blk_pwrite() 



When updating the PFLASH file contents, we should check for a
possible failure of blk_pwrite(). Similar to commit 3a688294.

Reported-by: Coverity (CID 1357678 CHECKED_RETURN)
Signed-off-by: default avatarMansour Ahmadi <mansourweb@gmail.com>
Message-Id: <20200408003552.58095-1-mansourweb@gmail.com>
[PMD: Add missing "qemu/error-report.h" include and TODO comment]
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 3072182d

hw/block/pflash_cfi01.c

+7 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "hw/qdev-properties.h"

#include "sysemu/block-backend.h"

#include "qapi/error.h"

#include "qemu/error-report.h"

#include "qemu/bitops.h"

#include "qemu/error-report.h"

#include "qemu/host-utils.h"
@@ -389,13 +390,18 @@ static void pflash_update(PFlashCFI01 *pfl, int offset, 
                          int size)

{

    int offset_end;

    int ret;

    if (pfl->blk) {

        offset_end = offset + size;

        /* widen to sector boundaries */

        offset = QEMU_ALIGN_DOWN(offset, BDRV_SECTOR_SIZE);

        offset_end = QEMU_ALIGN_UP(offset_end, BDRV_SECTOR_SIZE);

        blk_pwrite(pfl->blk, offset, pfl->storage + offset,

        ret = blk_pwrite(pfl->blk, offset, pfl->storage + offset,

                   offset_end - offset, 0);

        if (ret < 0) {

            /* TODO set error bit in status */

            error_report("Could not update PFLASH: %s", strerror(-ret));

        }

    }

}

hw/block/pflash_cfi02.c

+7 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "hw/block/flash.h"

#include "hw/qdev-properties.h"

#include "qapi/error.h"

#include "qemu/error-report.h"

#include "qemu/bitmap.h"

#include "qemu/timer.h"

#include "sysemu/block-backend.h"
@@ -393,13 +394,18 @@ static uint64_t pflash_read(void *opaque, hwaddr offset, unsigned int width) 
static void pflash_update(PFlashCFI02 *pfl, int offset, int size)

{

    int offset_end;

    int ret;

    if (pfl->blk) {

        offset_end = offset + size;

        /* widen to sector boundaries */

        offset = QEMU_ALIGN_DOWN(offset, BDRV_SECTOR_SIZE);

        offset_end = QEMU_ALIGN_UP(offset_end, BDRV_SECTOR_SIZE);

        blk_pwrite(pfl->blk, offset, pfl->storage + offset,

        ret = blk_pwrite(pfl->blk, offset, pfl->storage + offset,

                   offset_end - offset, 0);

        if (ret < 0) {

            /* TODO set error bit in status */

            error_report("Could not update PFLASH: %s", strerror(-ret));

        }

    }

}