From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: dri-devel@lists.freedesktop.org,
Sumit Semwal <sumit.semwal@linaro.org>,
"open list:DMA BUFFER SHARING FRAMEWORK"
<linux-media@vger.kernel.org>,
"moderated list:DMA BUFFER SHARING FRAMEWORK"
<linaro-mm-sig@lists.linaro.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 08/10] udmabuf: improve udmabuf_create error handling
Date: Tue, 11 Sep 2018 12:42:20 +0300 [thread overview]
Message-ID: <1927005.QJR53qTIv0@avalon> (raw)
In-Reply-To: <20180911065921.23818-9-kraxel@redhat.com>
Hi Gerd,
Thank you for the patch.
On Tuesday, 11 September 2018 09:59:19 EEST Gerd Hoffmann wrote:
> Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/dma-buf/udmabuf.c | 25 ++++++++++++-------------
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c
> index cb99a7886a..ec46513a47 100644
> --- a/drivers/dma-buf/udmabuf.c
> +++ b/drivers/dma-buf/udmabuf.c
> @@ -126,7 +126,7 @@ static long udmabuf_create(struct const
> udmabuf_create_list *head, struct file *memfd = NULL;
> struct udmabuf *ubuf;
> struct dma_buf *buf;
> - pgoff_t pgoff, pgcnt, pgidx, pgbuf, pglimit;
> + pgoff_t pgoff, pgcnt, pgidx, pgbuf = 0, pglimit;
> struct page *page;
> int seals, ret = -EINVAL;
> u32 i, flags;
> @@ -138,32 +138,32 @@ static long udmabuf_create(struct const
> udmabuf_create_list *head, pglimit = (size_limit_mb * 1024 * 1024) >>
> PAGE_SHIFT;
> for (i = 0; i < head->count; i++) {
> if (!IS_ALIGNED(list[i].offset, PAGE_SIZE))
> - goto err_free_ubuf;
> + goto err;
> if (!IS_ALIGNED(list[i].size, PAGE_SIZE))
> - goto err_free_ubuf;
> + goto err;
> ubuf->pagecount += list[i].size >> PAGE_SHIFT;
> if (ubuf->pagecount > pglimit)
> - goto err_free_ubuf;
> + goto err;
> }
> ubuf->pages = kmalloc_array(ubuf->pagecount, sizeof(struct page *),
> GFP_KERNEL);
> if (!ubuf->pages) {
> ret = -ENOMEM;
> - goto err_free_ubuf;
> + goto err;
> }
>
> pgbuf = 0;
> for (i = 0; i < head->count; i++) {
> memfd = fget(list[i].memfd);
> if (!memfd)
> - goto err_put_pages;
> + goto err;
> if (!shmem_mapping(file_inode(memfd)->i_mapping))
> - goto err_put_pages;
> + goto err;
> seals = memfd_fcntl(memfd, F_GET_SEALS, 0);
> if (seals == -EINVAL ||
> (seals & SEALS_WANTED) != SEALS_WANTED ||
> (seals & SEALS_DENIED) != 0)
> - goto err_put_pages;
> + goto err;
> pgoff = list[i].offset >> PAGE_SHIFT;
> pgcnt = list[i].size >> PAGE_SHIFT;
> for (pgidx = 0; pgidx < pgcnt; pgidx++) {
> @@ -171,13 +171,13 @@ static long udmabuf_create(struct const
> udmabuf_create_list *head, file_inode(memfd)->i_mapping, pgoff + pgidx);
> if (IS_ERR(page)) {
> ret = PTR_ERR(page);
> - goto err_put_pages;
> + goto err;
> }
> ubuf->pages[pgbuf++] = page;
> }
> fput(memfd);
> + memfd = NULL;
> }
> - memfd = NULL;
>
> exp_info.ops = &udmabuf_ops;
> exp_info.size = ubuf->pagecount << PAGE_SHIFT;
> @@ -186,7 +186,7 @@ static long udmabuf_create(struct const
> udmabuf_create_list *head, buf = dma_buf_export(&exp_info);
> if (IS_ERR(buf)) {
> ret = PTR_ERR(buf);
> - goto err_put_pages;
> + goto err;
> }
>
> flags = 0;
> @@ -194,10 +194,9 @@ static long udmabuf_create(struct const
> udmabuf_create_list *head, flags |= O_CLOEXEC;
> return dma_buf_fd(buf, flags);
>
> -err_put_pages:
> +err:
> while (pgbuf > 0)
> put_page(ubuf->pages[--pgbuf]);
> -err_free_ubuf:
> if (memfd)
> fput(memfd);
> kfree(ubuf->pages);
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2018-09-11 9:42 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 6:59 [PATCH 00/10] udmabuf: misc fixes Gerd Hoffmann
2018-09-11 6:59 ` [PATCH 01/10] udmabuf: sort headers, drop uapi/ path prefix Gerd Hoffmann
2018-09-11 6:59 ` Gerd Hoffmann
2018-09-11 9:35 ` Laurent Pinchart
2018-09-11 9:35 ` Laurent Pinchart
2018-09-11 6:59 ` [PATCH 02/10] udmabuf: improve map_udmabuf error handling Gerd Hoffmann
2018-09-11 6:59 ` Gerd Hoffmann
2018-09-11 9:37 ` Laurent Pinchart
2018-09-11 9:37 ` Laurent Pinchart
2018-09-11 6:59 ` [PATCH 03/10] udmabuf: use pgoff_t for pagecount Gerd Hoffmann
2018-09-11 6:59 ` Gerd Hoffmann
2018-09-11 7:38 ` Daniel Vetter
2018-09-11 6:59 ` [PATCH 04/10] udmabuf: constify udmabuf_ops Gerd Hoffmann
2018-09-11 6:59 ` Gerd Hoffmann
2018-09-11 9:38 ` Laurent Pinchart
2018-09-11 6:59 ` [PATCH 05/10] udmabuf: constify udmabuf_create args Gerd Hoffmann
2018-09-11 6:59 ` Gerd Hoffmann
2018-09-11 9:39 ` Laurent Pinchart
2018-09-11 6:59 ` [PATCH 06/10] udmabuf: add MEMFD_CREATE dependency Gerd Hoffmann
2018-09-11 6:59 ` Gerd Hoffmann
2018-09-11 9:40 ` Laurent Pinchart
2018-09-11 6:59 ` [PATCH 07/10] udmabuf: rework limits Gerd Hoffmann
2018-09-11 6:59 ` Gerd Hoffmann
2018-09-11 9:41 ` Laurent Pinchart
2018-09-11 9:41 ` Laurent Pinchart
2018-09-11 6:59 ` [PATCH 08/10] udmabuf: improve udmabuf_create error handling Gerd Hoffmann
2018-09-11 6:59 ` Gerd Hoffmann
2018-09-11 9:42 ` Laurent Pinchart [this message]
2018-09-11 6:59 ` [PATCH 09/10] udmabuf: use EBADFD in case we didn't got a memfd Gerd Hoffmann
2018-09-11 6:59 ` Gerd Hoffmann
2018-09-11 6:59 ` [PATCH 10/10] udmabuf: use ENOTTY for invalid ioctls Gerd Hoffmann
2018-09-11 6:59 ` Gerd Hoffmann
2018-09-11 9:43 ` Laurent Pinchart
2018-09-11 9:43 ` Laurent Pinchart
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=1927005.QJR53qTIv0@avalon \
--to=laurent.pinchart@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kraxel@redhat.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=sumit.semwal@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.