From: "Michael S. Tsirkin" <mst@redhat.com>
To: Auger Eric <eric.auger@redhat.com>
Cc: eric.auger.pro@gmail.com, hch@lst.de, m.szyprowski@samsung.com,
robin.murphy@arm.com, jasowang@redhat.com,
virtualization@lists.linux-foundation.org,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] dma-mapping: Use dma_get_mask in dma_addressing_limited
Date: Mon, 22 Jul 2019 14:57:04 -0400 [thread overview]
Message-ID: <20190722145639-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <77ba1061-08b6-421e-a6dd-d5db9851325b@redhat.com>
On Mon, Jul 22, 2019 at 06:56:49PM +0200, Auger Eric wrote:
> Hi Christoph,
>
> On 7/22/19 6:51 PM, Eric Auger wrote:
> > We currently have cases where the dma_addressing_limited() gets
> > called with dma_mask unset. This causes a NULL pointer dereference.
> >
> > Use dma_get_mask() accessor to prevent the crash.
> >
> > Fixes: b866455423e0 ("dma-mapping: add a dma_addressing_limited helper")
> > Signed-off-by: Eric Auger <eric.auger@redhat.com>
>
> As a follow-up of my last email, here is a patch featuring
> dma_get_mask(). But you don't have the WARN_ON_ONCE anymore, pointing
> out suspect users.
OTOH these users then simply become okay so no need for WARN_ON_ONCE
then :)
> Feel free to pick up your preferred approach
>
> Thanks
>
> Eric
> >
> > ---
> >
> > v1 -> v2:
> > - was [PATCH 1/2] dma-mapping: Protect dma_addressing_limited
> > against NULL dma_mask
> > - Use dma_get_mask
> > ---
> > include/linux/dma-mapping.h | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
> > index e11b115dd0e4..f7d1eea32c78 100644
> > --- a/include/linux/dma-mapping.h
> > +++ b/include/linux/dma-mapping.h
> > @@ -689,8 +689,8 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask)
> > */
> > static inline bool dma_addressing_limited(struct device *dev)
> > {
> > - return min_not_zero(*dev->dma_mask, dev->bus_dma_mask) <
> > - dma_get_required_mask(dev);
> > + return min_not_zero(dma_get_mask(dev), dev->bus_dma_mask) <
> > + dma_get_required_mask(dev);
> > }
> >
> > #ifdef CONFIG_ARCH_HAS_SETUP_DMA_OPS
> >
next prev parent reply other threads:[~2019-07-22 18:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-22 16:51 [PATCH v2] dma-mapping: Use dma_get_mask in dma_addressing_limited Eric Auger
2019-07-22 16:56 ` Auger Eric
2019-07-22 18:57 ` Michael S. Tsirkin [this message]
2019-07-23 15:37 ` Christoph Hellwig
2019-07-22 18:45 ` Michael S. Tsirkin
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=20190722145639-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=eric.auger@redhat.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=robin.murphy@arm.com \
--cc=virtualization@lists.linux-foundation.org \
/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;
as well as URLs for NNTP newsgroup(s).