| Message ID | 4f5a3f49b934ff24227ebc95b3f9177f0147ff52.1710282274.git.mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [PULL,01/68] vdpa: add back vhost_vdpa_net_first_nc_vdpa | expand |
Hi Michael, Thanks a lot and also this one, I forgot to update the status :/, this patch has been merged (commit 8cb84d7d6bd1f, "hw/pci-bridge/ cxl_upstream: Fix missing ERRP_GUARD() in cxl_usp_realize()"). Sorry to make you repeat the merge. Best Regards, Zhao On Tue, Mar 12, 2024 at 06:27:25PM -0400, Michael S. Tsirkin wrote: > Date: Tue, 12 Mar 2024 18:27:25 -0400 > From: "Michael S. Tsirkin" <mst@redhat.com> > Subject: [PULL 37/68] hw/pci-bridge/cxl_upstream: Fix missing ERRP_GUARD() > in cxl_usp_realize() > X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 > > From: Zhao Liu <zhao1.liu@intel.com> > > As the comment in qapi/error, dereferencing @errp requires > ERRP_GUARD(): > > * = Why, when and how to use ERRP_GUARD() = > * > * Without ERRP_GUARD(), use of the @errp parameter is restricted: > * - It must not be dereferenced, because it may be null. > ... > * ERRP_GUARD() lifts these restrictions. > * > * To use ERRP_GUARD(), add it right at the beginning of the function. > * @errp can then be used without worrying about the argument being > * NULL or &error_fatal. > * > * Using it when it's not needed is safe, but please avoid cluttering > * the source with useless code. > > But in cxl_usp_realize(), @errp is dereferenced without ERRP_GUARD(): > > cxl_doe_cdat_init(cxl_cstate, errp); > if (*errp) { > goto err_cap; > } > > Here we check *errp, because cxl_doe_cdat_init() returns void. And since > cxl_usp_realize() - as a PCIDeviceClass.realize() method - doesn't get > the NULL @errp parameter, it hasn't triggered the bug that dereferencing > the NULL @errp. > > To follow the requirement of @errp, add missing ERRP_GUARD() in > cxl_usp_realize(). > > Suggested-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com> > Reviewed-by: Markus Armbruster <armbru@redhat.com> > Message-Id: <20240223085653.1255438-6-zhao1.liu@linux.intel.com> > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > --- > hw/pci-bridge/cxl_upstream.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c > index 537f9affb8..783fa6adac 100644 > --- a/hw/pci-bridge/cxl_upstream.c > +++ b/hw/pci-bridge/cxl_upstream.c > @@ -289,6 +289,7 @@ static void free_default_cdat_table(CDATSubHeader **cdat_table, int num, > > static void cxl_usp_realize(PCIDevice *d, Error **errp) > { > + ERRP_GUARD(); > PCIEPort *p = PCIE_PORT(d); > CXLUpstreamPort *usp = CXL_USP(d); > CXLComponentState *cxl_cstate = &usp->cxl_cstate; > -- > MST >
diff --git a/hw/pci-bridge/cxl_upstream.c b/hw/pci-bridge/cxl_upstream.c index 537f9affb8..783fa6adac 100644 --- a/hw/pci-bridge/cxl_upstream.c +++ b/hw/pci-bridge/cxl_upstream.c @@ -289,6 +289,7 @@ static void free_default_cdat_table(CDATSubHeader **cdat_table, int num, static void cxl_usp_realize(PCIDevice *d, Error **errp) { + ERRP_GUARD(); PCIEPort *p = PCIE_PORT(d); CXLUpstreamPort *usp = CXL_USP(d); CXLComponentState *cxl_cstate = &usp->cxl_cstate;