From: Jason Gunthorpe <jgg@ziepe.ca>
To: Alex Mastro <amastro@fb.com>
Cc: Alex Williamson <alex.williamson@redhat.com>,
Alejandro Jimenez <alejandro.j.jimenez@oracle.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/3] vfio/type1: sanitize for overflow using check_*_overflow
Date: Wed, 8 Oct 2025 09:19:30 -0300 [thread overview]
Message-ID: <20251008121930.GA3734646@ziepe.ca> (raw)
In-Reply-To: <20251007-fix-unmap-v2-1-759bceb9792e@fb.com>
On Tue, Oct 07, 2025 at 09:08:46PM -0700, Alex Mastro wrote:
> Adopt check_*_overflow functions to clearly express overflow check
> intent.
>
> Signed-off-by: Alex Mastro <amastro@fb.com>
> ---
> drivers/vfio/vfio_iommu_type1.c | 54 ++++++++++++++++++++++++++++++++---------
> 1 file changed, 43 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
> index f8d68fe77b41..b510ef3f397b 100644
> --- a/drivers/vfio/vfio_iommu_type1.c
> +++ b/drivers/vfio/vfio_iommu_type1.c
> @@ -37,6 +37,7 @@
> #include <linux/vfio.h>
> #include <linux/workqueue.h>
> #include <linux/notifier.h>
> +#include <linux/overflow.h>
> #include "vfio.h"
>
> #define DRIVER_VERSION "0.2"
> @@ -825,14 +826,25 @@ static int vfio_iommu_type1_pin_pages(void *iommu_data,
> unsigned long remote_vaddr;
> struct vfio_dma *dma;
> bool do_accounting;
> + dma_addr_t iova_end;
> + size_t iova_size;
>
> - if (!iommu || !pages)
> + if (!iommu || !pages || npage < 0)
> return -EINVAL;
>
> /* Supported for v2 version only */
> if (!iommu->v2)
> return -EACCES;
>
> + if (npage == 0)
> + return 0;
> +
> + if (check_mul_overflow(npage, PAGE_SIZE, &iova_size))
> + return -EINVAL;
-EOVERFLOW and everywhere else
> +
> + if (check_add_overflow(user_iova, iova_size - 1, &iova_end))
> + return -EINVAL;
Let's be consistent with iommufd/etc, 'end' is start+size 'last' is start+size-1
Otherwise it is super confusing :(
Jason
next prev parent reply other threads:[~2025-10-08 12:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-08 4:08 [PATCH v2 0/3] vfio: handle DMA map/unmap up to the addressable limit Alex Mastro
2025-10-08 4:08 ` [PATCH v2 1/3] vfio/type1: sanitize for overflow using check_*_overflow Alex Mastro
2025-10-08 12:19 ` Jason Gunthorpe [this message]
2025-10-08 15:39 ` Alex Mastro
2025-10-08 22:19 ` Alex Mastro
2025-10-09 1:15 ` Jason Gunthorpe
2025-10-09 18:01 ` Alex Mastro
2025-10-08 4:08 ` [PATCH v2 2/3] vfio/type1: move iova increment to unmap_unpin_* caller Alex Mastro
2025-10-08 4:08 ` [PATCH v2 3/3] vfio/type1: handle DMA map/unmap up to the addressable limit Alex Mastro
2025-10-09 0:25 ` Alex Mastro
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=20251008121930.GA3734646@ziepe.ca \
--to=jgg@ziepe.ca \
--cc=alejandro.j.jimenez@oracle.com \
--cc=alex.williamson@redhat.com \
--cc=amastro@fb.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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