On Thu, Feb 27, 2020 at 07:42:49AM -0600, Shivaprasad G Bhat wrote: > Fixes Coverity issue, > CID 1419883: Error handling issues (CHECKED_RETURN) > Calling "qemu_uuid_parse" without checking return value > > nvdimm_set_uuid() already verifies if the user provided uuid is valid or > not. So, need to check for the validity during pre-plug validation again. > > As this a false positive in this case, assert if not valid to be safe. > Also, error_abort if QOM accessor encounters error while fetching the uuid > property. > > Reported-by: Coverity (CID 1419883) > Signed-off-by: Shivaprasad G Bhat <sb...@linux.ibm.com>
Applied to ppc-for-5.0, thanks.
> ---
> hw/ppc/spapr_nvdimm.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c
> index 74eeb8bb74..25be8082d7 100644
> --- a/hw/ppc/spapr_nvdimm.c
> +++ b/hw/ppc/spapr_nvdimm.c
> @@ -35,6 +35,7 @@ void spapr_nvdimm_validate_opts(NVDIMMDevice *nvdimm,
> uint64_t size,
> {
> char *uuidstr = NULL;
> QemuUUID uuid;
> + int ret;
>
> if (size % SPAPR_MINIMUM_SCM_BLOCK_SIZE) {
> error_setg(errp, "NVDIMM memory size excluding the label area"
> @@ -43,8 +44,10 @@ void spapr_nvdimm_validate_opts(NVDIMMDevice *nvdimm,
> uint64_t size,
> return;
> }
>
> - uuidstr = object_property_get_str(OBJECT(nvdimm), NVDIMM_UUID_PROP,
> NULL);
> - qemu_uuid_parse(uuidstr, &uuid);
> + uuidstr = object_property_get_str(OBJECT(nvdimm), NVDIMM_UUID_PROP,
> + &error_abort);
> + ret = qemu_uuid_parse(uuidstr, &uuid);
> + g_assert(!ret);
> g_free(uuidstr);
>
> if (qemu_uuid_is_null(&uuid)) {
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
