Commit 4fa4302d authored by Fan Ni's avatar Fan Ni Committed by Dan Williams
Browse files

cxl/region: Fix null pointer dereference for resetting decoder 



Not all decoders have a reset callback.

The CXL specification allows a host bridge with a single root port to
have no explicit HDM decoders. Currently the region driver assumes there
are none.  As such the CXL core creates a special pass through decoder
instance without a commit/reset callback.

Prior to this patch, the ->reset() callback was called unconditionally when
calling cxl_region_decode_reset. Thus a configuration with 1 Host Bridge,
1 Root Port, and one directly attached CXL type 3 device or multiple CXL
type 3 devices attached to downstream ports of a switch can cause a null
pointer dereference.

Before the fix, a kernel crash was observed when we destroy the region, and
a pass through decoder is reset.

The issue can be reproduced as below,
    1) create a region with a CXL setup which includes a HB with a
    single root port under which a memdev is attached directly.
    2) destroy the region with cxl destroy-region regionX -f.

Fixes: 176baefb ("cxl/hdm: Commit decoder state to hardware")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarFan Ni <fan.ni@samsung.com>
Reviewed-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Tested-by: default avatarGregory Price <gregory.price@memverge.com>
Reviewed-by: default avatarGregory Price <gregory.price@memverge.com>
Link: https://lore.kernel.org/r/20221215170909.2650271-1-fan.ni@samsung.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 6d796c50

drivers/cxl/core/region.c

+5 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static int cxl_region_decode_reset(struct cxl_region *cxlr, int count) 
		struct cxl_memdev *cxlmd = cxled_to_memdev(cxled);

		struct cxl_port *iter = cxled_to_port(cxled);

		struct cxl_ep *ep;

		int rc;

		int rc = 0;



		while (!is_cxl_root(to_cxl_port(iter->dev.parent)))

			iter = to_cxl_port(iter->dev.parent);
@@ -143,6 +143,7 @@ static int cxl_region_decode_reset(struct cxl_region *cxlr, int count) 


			cxl_rr = cxl_rr_load(iter, cxlr);

			cxld = cxl_rr->decoder;

			if (cxld->reset)

				rc = cxld->reset(cxld);

			if (rc)

				return rc;
@@ -186,6 +187,7 @@ static int cxl_region_decode_commit(struct cxl_region *cxlr) 
			     iter = ep->next, ep = cxl_ep_load(iter, cxlmd)) {

				cxl_rr = cxl_rr_load(iter, cxlr);

				cxld = cxl_rr->decoder;

				if (cxld->reset)

					cxld->reset(cxld);

			}