From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: Valerii Sokolov <valerii.sokolov@pm.me>
Cc: Bingbu Cao <bingbu.cao@intel.com>,
Tianshu Qiu <tian.shu.qiu@intel.com>,
Antti Laakso <antti.laakso@linux.intel.com>,
Sarang Sapre <sarang.sapre@intel.com>,
Divyamani Tripathi <divyamani.tripathi@intel.com>,
Manik Bajpai <manik.bajpai@intel.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 07/11] media: intel/ipu6: fix IOVA leak on first entry failure in ipu6_dma_map_sg()
Date: Wed, 18 Nov 2026 11:05:51 +0200 [thread overview]
Message-ID: <av1qb7JYDCYPDZ_A@kekkonen.localdomain> (raw)
In-Reply-To: <20261118004421.248769-1-valerii.sokolov@pm.me>
Hi Valerii,
On Wed, Nov 18, 2026 at 12:44:42AM +0000, Valerii Sokolov wrote:
> Hi Sakari,
>
> On Wed, Nov 04, 2026 at 03:02:56PM +0200, Sakari Ailus wrote:
> > On Tue, Nov 03, 2026 at 09:11:03PM +0000, Valerii Sokolov wrote:
> > > diff --git a/drivers/media/pci/intel/ipu6/ipu6-dma.c b/drivers/media/pci/intel/ipu6/ipu6-dma.c
> > > index 90f530a937..a923a1e4bd 100644
> > > --- a/drivers/media/pci/intel/ipu6/ipu6-dma.c
> > > +++ b/drivers/media/pci/intel/ipu6/ipu6-dma.c
> > > @@ -444,7 +444,10 @@ int ipu6_dma_map_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist,
> > > return nents;
> > >
> > > out_fail:
> > > - ipu6_dma_unmap_sg(sys, sglist, i, dir, attrs);
> > > + if (i)
> > > + ipu6_dma_unmap_sg(sys, sglist, i, dir, attrs);
> > > + else
> > > + __free_iova(&mmu->dmap->iovad, iova);
> >
> > This should be handled in ipu6_dma_unmap_sg(). I'd release the iova in the
> > beginning and reverse the order of the nents / iova checks.
> >
> > I'll merge the rest now.
>
> Sorry for the delayed reply, and thank you for merging the other
> patches!
>
> Regarding handling nents == 0 inside ipu6_dma_unmap_sg():
> ipu6_dma_unmap_sg() looks up the IOVA via:
>
> struct iova *iova = find_iova(&mmu->dmap->iovad,
> PHYS_PFN(sg_dma_address(sglist)));
>
> However, in ipu6_dma_map_sg(), sg_dma_address(sg) is only overwritten
> with PFN_PHYS(iova_addr) after ipu6_mmu_map() succeeds:
Right, then indeed this seems to be the least bad of the options. I'll pick
it.
--
Regards,
Sakari Ailus
next prev parent reply other threads:[~2026-11-18 9:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-03 21:10 [PATCH v2 00/11] media: intel/ipu6: bounds, leak, and error handling fixes Valerii Sokolov
2026-11-03 21:10 ` [PATCH v2 01/11] media: intel/ipu6: move busy check to ipu6_isys_vidioc_s_fmt_vid_cap() Valerii Sokolov
2026-11-03 21:10 ` [PATCH v2 02/11] media: intel/ipu6: fix firmware message buffer leak on send failure Valerii Sokolov
2026-11-03 21:10 ` [PATCH v2 03/11] media: intel/ipu6: check pin bounds in ipu6_isys_fw_pin_cfg() Valerii Sokolov
2026-11-03 21:10 ` [PATCH v2 04/11] media: intel/ipu6: clamp crop top offset in ipu6_isys_csi2_set_sel() Valerii Sokolov
2026-11-03 21:10 ` [PATCH v2 05/11] media: intel/ipu6: check irq_status mask before calling subdevice ISR Valerii Sokolov
2026-11-03 21:10 ` [PATCH v2 06/11] media: intel/ipu6: clean up fwctx on ipu6_fw_com_open() failure Valerii Sokolov
2026-11-03 21:11 ` [PATCH v2 07/11] media: intel/ipu6: fix IOVA leak on first entry failure in ipu6_dma_map_sg() Valerii Sokolov
2026-11-04 13:02 ` Sakari Ailus
2026-11-18 0:44 ` Valerii Sokolov
2026-11-18 9:05 ` Sakari Ailus [this message]
2026-11-03 21:11 ` [PATCH v2 08/11] media: intel/ipu6: return an error from ipu6_dma_map_sg() on failure Valerii Sokolov
2026-11-03 21:11 ` [PATCH v2 09/11] media: intel/ipu6: unmap the dummy L2 page table in ipu6_mmu_destroy() Valerii Sokolov
2026-11-03 21:11 ` [PATCH v2 10/11] media: intel/ipu6: pass the device to dev_err() in ipu6_mmu_unmap() Valerii Sokolov
2026-11-03 21:11 ` [PATCH v2 11/11] media: intel/ipu6: fix EOF sequence logging in ipu6_isys_isr_one() Valerii Sokolov
2026-11-04 13:35 ` Sakari Ailus
2026-11-18 0:45 ` [PATCH v3] media: intel/ipu6: omit sequence number from EOF debug log Valerii Sokolov
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=av1qb7JYDCYPDZ_A@kekkonen.localdomain \
--to=sakari.ailus@linux.intel.com \
--cc=antti.laakso@linux.intel.com \
--cc=bingbu.cao@intel.com \
--cc=divyamani.tripathi@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=manik.bajpai@intel.com \
--cc=mchehab@kernel.org \
--cc=sarang.sapre@intel.com \
--cc=tian.shu.qiu@intel.com \
--cc=valerii.sokolov@pm.me \
/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
all inboxes | Powered by JetHome®