Message ID | 20210809104324.49434-1-its@irrelevant.dk |
---|---|
State | New |
Headers | show |
Series | hw/nvme: fix missing variable initializers | expand |
On 8/9/21 12:43 PM, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> > > Coverity found that 'uuid', 'csi' and 'eui64' are uninitialized. While > we set most of the fields, we do not explicitly set the rsvd2 field in > the NvmeIdNsDescr header. > > Fix this by explicitly zero-initializing the variables. > > Reported-by: Coverity (CID 1458835, 1459295 and 1459580) > Fixes: 6870cfb8140d ("hw/nvme: namespace parameter for EUI-64") > Suggested-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > --- > hw/nvme/ctrl.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On Aug 9 12:47, Philippe Mathieu-Daudé wrote: > On 8/9/21 12:43 PM, Klaus Jensen wrote: > > From: Klaus Jensen <k.jensen@samsung.com> > > > > Coverity found that 'uuid', 'csi' and 'eui64' are uninitialized. While > > we set most of the fields, we do not explicitly set the rsvd2 field in > > the NvmeIdNsDescr header. > > > > Fix this by explicitly zero-initializing the variables. > > > > Reported-by: Coverity (CID 1458835, 1459295 and 1459580) > > Fixes: 6870cfb8140d ("hw/nvme: namespace parameter for EUI-64") > > Suggested-by: Peter Maydell <peter.maydell@linaro.org> > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > > --- > > hw/nvme/ctrl.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Swift as always Philippe, thanks! Yes, I'll PR this for -rc3 immediately.
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 43dfaeac9f54..6baf9e0420d5 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -4663,15 +4663,15 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) struct { NvmeIdNsDescr hdr; uint8_t v[NVME_NIDL_UUID]; - } QEMU_PACKED uuid; + } QEMU_PACKED uuid = {}; struct { NvmeIdNsDescr hdr; uint64_t v; - } QEMU_PACKED eui64; + } QEMU_PACKED eui64 = {}; struct { NvmeIdNsDescr hdr; uint8_t v; - } QEMU_PACKED csi; + } QEMU_PACKED csi = {}; trace_pci_nvme_identify_ns_descr_list(nsid);