From d5d21fdc1b222e677430d59534523b226095eef5 Mon Sep 17 00:00:00 2001 From: Yonghua Huang Date: Wed, 10 Apr 2024 18:53:27 +0800 Subject: [PATCH] hv: fix potential NULL pointer dereferrence in ivshmem.c secure coding fix. Tracked-On: #8566 Signed-off-by: Yonghua Huang Reviewed-by: Junjie Mao --- hypervisor/dm/vpci/ivshmem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hypervisor/dm/vpci/ivshmem.c b/hypervisor/dm/vpci/ivshmem.c index 164ce16d5..129e791d8 100644 --- a/hypervisor/dm/vpci/ivshmem.c +++ b/hypervisor/dm/vpci/ivshmem.c @@ -343,7 +343,10 @@ static void init_ivshmem_vdev(struct pci_vdev *vdev) PCIM_HDRTYPE_NORMAL | ((vdev->bdf.bits.f == 0U) ? PCIM_MFDEV : 0U)); pci_vdev_write_vcfg(vdev, PCIV_SUB_VENDOR_ID, 2U, IVSHMEM_INTEL_SUBVENDOR_ID); - pci_vdev_write_vcfg(vdev, PCIV_SUB_SYSTEM_ID, 2U, region->region_id); + if (region != NULL) { + pci_vdev_write_vcfg(vdev, PCIV_SUB_SYSTEM_ID, 2U, region->region_id); + } + add_vmsix_capability(vdev, MAX_IVSHMEM_MSIX_TBL_ENTRY_NUM, IVSHMEM_MSIX_BAR); /* initialize ivshmem bars */