Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230601224419.2392422-1-olvaffe@gmail.com> <0e55585d-d6d7-b9ac-aed5-8df56895e209@amd.com>
In-Reply-To: <0e55585d-d6d7-b9ac-aed5-8df56895e209@amd.com>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Fri, 2 Jun 2023 14:22:59 -0400
Message-ID: <CADnq5_MEZU=wD+wXdt+x0_LJS6y=PqkMLw7qD7yFk8ObR0k0-Q@mail.gmail.com>
Subject: Re: [PATCH v3] amdgpu: validate offset_in_bo of drm_amdgpu_gem_va
To:     =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>
Cc:     Chia-I Wu <olvaffe@gmail.com>, dri-devel@lists.freedesktop.org,
        Philip Yang <Philip.Yang@amd.com>,
        Jammy Zhou <Jammy.Zhou@amd.com>,
        Mukul Joshi <mukul.joshi@amd.com>, Lang Yu <Lang.Yu@amd.com>,
        Felix Kuehling <Felix.Kuehling@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>, linux-kernel@vger.kernel.org,
        amd-gfx@lists.freedesktop.org,
        =?UTF-8?B?TWFyZWsgT2zFocOhaw==?= <marek.olsak@amd.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        Alex Deucher <alexander.deucher@amd.com>,
        David Airlie <airlied@gmail.com>,
        Danijel Slivka <danijel.slivka@amd.com>,
        Hawking Zhang <Hawking.Zhang@amd.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Applied.  Thanks!


Alex

On Fri, Jun 2, 2023 at 7:43=E2=80=AFAM Christian K=C3=B6nig <christian.koen=
ig@amd.com> wrote:
>
> Am 02.06.23 um 00:44 schrieb Chia-I Wu:
> > This is motivated by OOB access in amdgpu_vm_update_range when
> > offset_in_bo+map_size overflows.
> >
> > v2: keep the validations in amdgpu_vm_bo_map
> > v3: add the validations to amdgpu_vm_bo_map/amdgpu_vm_bo_replace_map
> >      rather than to amdgpu_gem_va_ioctl
> >
> > Fixes: 9f7eb5367d00 ("drm/amdgpu: actually use the VM map parameters")
> > Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
>
> Reviewed-by: Christian K=C3=B6nig <christian.koenig@amd.com>
>
> > ---
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 ++++++++--------
> >   1 file changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/a=
md/amdgpu/amdgpu_vm.c
> > index 22f9a65ca0fc7..76d57bc7ac620 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> > @@ -1434,14 +1434,14 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev=
,
> >       uint64_t eaddr;
> >
> >       /* validate the parameters */
> > -     if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK ||
> > -         size =3D=3D 0 || size & ~PAGE_MASK)
> > +     if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MAS=
K)
> > +             return -EINVAL;
> > +     if (saddr + size <=3D saddr || offset + size <=3D offset)
> >               return -EINVAL;
> >
> >       /* make sure object fit at this offset */
> >       eaddr =3D saddr + size - 1;
> > -     if (saddr >=3D eaddr ||
> > -         (bo && offset + size > amdgpu_bo_size(bo)) ||
> > +     if ((bo && offset + size > amdgpu_bo_size(bo)) ||
> >           (eaddr >=3D adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT=
))
> >               return -EINVAL;
> >
> > @@ -1500,14 +1500,14 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_devi=
ce *adev,
> >       int r;
> >
> >       /* validate the parameters */
> > -     if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK ||
> > -         size =3D=3D 0 || size & ~PAGE_MASK)
> > +     if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MAS=
K)
> > +             return -EINVAL;
> > +     if (saddr + size <=3D saddr || offset + size <=3D offset)
> >               return -EINVAL;
> >
> >       /* make sure object fit at this offset */
> >       eaddr =3D saddr + size - 1;
> > -     if (saddr >=3D eaddr ||
> > -         (bo && offset + size > amdgpu_bo_size(bo)) ||
> > +     if ((bo && offset + size > amdgpu_bo_size(bo)) ||
> >           (eaddr >=3D adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT=
))
> >               return -EINVAL;
> >
>