From: Alison Schofield <alison.schofield@intel.com>
To: Dan Williams <dan.j.williams@intel.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>,
Jonathan Cameron <jonathan.cameron@huawei.com>,
Dave Jiang <dave.jiang@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Ira Weiny <ira.weiny@intel.com>,
linux-cxl@vger.kernel.org
Subject: Re: [PATCH] cxl/region: Avoid null pointer dereference in region lookup
Date: Tue, 4 Jun 2024 17:43:06 -0700 [thread overview]
Message-ID: <Zl+0mve3AnoOExXq@aschofie-mobl2> (raw)
In-Reply-To: <665f5337939f5_2a90e294f2@dwillia2-xfh.jf.intel.com.notmuch>
On Tue, Jun 04, 2024 at 10:47:35AM -0700, Dan Williams wrote:
> Perhaps change the subject with: s/Avoid/Fix/?
OK
>
> alison.schofield@ wrote:
> > From: Alison Schofield <alison.schofield@intel.com>
> >
> > cxl_dpa_to_region() looks up a region based on a memdev and DPA.
> > It wrongly assumes an endpoint found mapping the DPA is also of
> > a fully assembled region. When not true it leads to a null pointer
> > dereference looking up the region name.
>
> Can you place the a snippet of the Call Trace here, that helps support
> that the writeup came to the right conclusion, and it helps folks
> hitting this error to find this patch in a web search.
Will add in v2
snip...
>
> > diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
> > index 3c2b6144be23..88051bb673bf 100644
> > --- a/drivers/cxl/core/region.c
> > +++ b/drivers/cxl/core/region.c
> > @@ -2688,22 +2688,33 @@ static int __cxl_dpa_to_region(struct device *dev, void *arg)
> > {
> > struct cxl_dpa_to_region_context *ctx = arg;
> > struct cxl_endpoint_decoder *cxled;
> > + struct cxl_region *cxlr;
> > u64 dpa = ctx->dpa;
> >
> > if (!is_endpoint_decoder(dev))
> > return 0;
> >
> > cxled = to_cxl_endpoint_decoder(dev);
> > - if (!cxled->dpa_res || !resource_size(cxled->dpa_res))
> > + if (!cxled || !cxled->dpa_res || !resource_size(cxled->dpa_res))
>
> Why add the !cxled check? to_cxl_endpoint_decoder() only returns NULL if
> someone messes up and sends a !is_endpoint_decoder(@dev) to this
> conversion routine and that check was already performed above.
>
Abundance of caution I suppose. I'll remove.
> > return 0;
> >
> > if (dpa > cxled->dpa_res->end || dpa < cxled->dpa_res->start)
> > return 0;
> >
> > - dev_dbg(dev, "dpa:0x%llx mapped in region:%s\n", dpa,
> > - dev_name(&cxled->cxld.region->dev));
> > + /*
> > + * Stop the region search (return 1) when an endpoint mapping is
> > + * found. The region may not be fully constructed so offering
> > + * the cxlr in the context structure is not guaranteed.
> > + */
>
> Comment looks good...
>
> > + cxlr = cxled->cxld.region;
> > + if (cxlr)
> > + dev_dbg(dev, "dpa:0x%llx mapped in region:%s\n", dpa,
> > + dev_name(&cxlr->dev));
> > + else
> > + dev_dbg(dev, "dpa:0x%llx mapped in endpoint:%s\n", dpa,
> > + dev_name(dev));
>
> ...but I am not sure gymanistics to improve a debug message are worth
> it, especially because all of the callers either emit the found region
> in a tracepoint or print a warning, so I would just be in favor of
> deleting the debug message altogether, or at most just trimming to the
> "mapped in endpoint" one.
Yeah, probably went overboard here. Previously was offering the name
of the region so wanted to keep same - but seeing as this is a debug
only message, I think the endpoint alone, as you suggest is good.
Thanks for the review,
Alison
prev parent reply other threads:[~2024-06-05 0:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-04 0:36 [PATCH] cxl/region: Avoid null pointer dereference in region lookup alison.schofield
2024-06-04 16:37 ` Jonathan Cameron
2024-06-04 17:47 ` Dan Williams
2024-06-05 0:43 ` Alison Schofield [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zl+0mve3AnoOExXq@aschofie-mobl2 \
--to=alison.schofield@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dave@stgolabs.net \
--cc=ira.weiny@intel.com \
--cc=jonathan.cameron@huawei.com \
--cc=linux-cxl@vger.kernel.org \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox