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: <20221130185748.357410-1-robdclark@gmail.com> <20221130185748.357410-2-robdclark@gmail.com>
 <3e9e157d-e740-ee5b-b8d3-07822b2c9a9b@collabora.com>
In-Reply-To: <3e9e157d-e740-ee5b-b8d3-07822b2c9a9b@collabora.com>
From:   Rob Clark <robdclark@gmail.com>
Date:   Tue, 6 Dec 2022 10:09:16 -0800
Message-ID: <CAF6AEGud11KEJvBY9J_TPahFOvo=C0VhG0An7nfNbsHXKbKC2w@mail.gmail.com>
Subject: Re: [PATCH v2 1/2] drm/shmem-helper: Remove errant put in error path
To:     Dmitry Osipenko <dmitry.osipenko@collabora.com>
Cc:     dri-devel@lists.freedesktop.org,
        Rob Clark <robdclark@chromium.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        open list <linux-kernel@vger.kernel.org>,
        stable@vger.kernel.org, Eric Anholt <eric@anholt.net>,
        =?UTF-8?Q?Noralf_Tr=C3=B8nnes?= <noralf@tronnes.org>,
        syzbot+c8ae65286134dd1b800d@syzkaller.appspotmail.com
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Sun, Dec 4, 2022 at 12:45 PM Dmitry Osipenko
<dmitry.osipenko@collabora.com> wrote:
>
> On 11/30/22 21:57, Rob Clark wrote:
> > From: Rob Clark <robdclark@chromium.org>
> >
> > drm_gem_shmem_mmap() doesn't own this reference, resulting in the GEM
> > object getting prematurely freed leading to a later use-after-free.
> >
> > Link: https://syzkaller.appspot.com/bug?extid=c8ae65286134dd1b800d
> > Reported-by: syzbot+c8ae65286134dd1b800d@syzkaller.appspotmail.com
> > Fixes: 2194a63a818d ("drm: Add library for shmem backed GEM objects")
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Rob Clark <robdclark@chromium.org>
> > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> >  drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +---
> >  1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> > index 35138f8a375c..3b7b71391a4c 100644
> > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> > @@ -622,10 +622,8 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct
> >       }
> >
> >       ret = drm_gem_shmem_get_pages(shmem);
> > -     if (ret) {
> > -             drm_gem_vm_close(vma);
> > +     if (ret)
> >               return ret;
> > -     }
> >
> >       vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
> >       vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
>
> AFAICS, the dmabuf mmaping code path needs a similar fix, isn't it?
>
> -               /* Drop the reference drm_gem_mmap_obj() acquired.*/
> -               drm_gem_object_put(obj);
>                 vma->vm_private_data = NULL;
>
> -               return dma_buf_mmap(obj->dma_buf, vma, 0);
> +               ret = dma_buf_mmap(obj->dma_buf, vma, 0);
> +
> +               /* Drop the reference drm_gem_mmap_obj() acquired.*/
> +               if (!ret)
> +                       drm_gem_object_put(obj);
> +
> +               return ret;
>

Yes, it seems that way.. I wish the shmem helpers worked in a less
"special" way with regards to refcnting :-(

BR,
-R