From: "Christian König" <christian.koenig@amd.com>
To: Dan Carpenter <dan.carpenter@linaro.org>,
Rob Clark <robdclark@chromium.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>,
Gustavo Padovan <gustavo@padovan.org>,
Dmitry Baryshkov <lumag@kernel.org>,
Pekka Paalanen <pekka.paalanen@collabora.com>,
linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v2] dma-buf/sw_sync: Decrement refcount on error in sw_sync_ioctl_get_deadline()
Date: Fri, 11 Apr 2025 15:20:06 +0200 [thread overview]
Message-ID: <f30552b0-36a7-4a56-a117-44e9eb3a14bf@amd.com> (raw)
In-Reply-To: <a010a1ac-107b-4fc0-a052-9fd3706ad690@stanley.mountain>
Am 08.04.25 um 13:01 schrieb Dan Carpenter:
> Call dma_fence_put(fence) before returning an error if
> dma_fence_to_sync_pt() fails. Use an unwind ladder at the
> end of the function to do the cleanup.
>
> Fixes: 70e67aaec2f4 ("dma-buf/sw_sync: Add fence deadline support")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed and pushed to drm-misc-fixes.
Sorry for the delay, I was fighting a bit with dim after the migration.
Thanks,
Christian.
> ---
> v2: style changes.
>
> drivers/dma-buf/sw_sync.c | 19 ++++++++++++++-----
> 1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/dma-buf/sw_sync.c b/drivers/dma-buf/sw_sync.c
> index f5905d67dedb..22a808995f10 100644
> --- a/drivers/dma-buf/sw_sync.c
> +++ b/drivers/dma-buf/sw_sync.c
> @@ -438,15 +438,17 @@ static int sw_sync_ioctl_get_deadline(struct sync_timeline *obj, unsigned long a
> return -EINVAL;
>
> pt = dma_fence_to_sync_pt(fence);
> - if (!pt)
> - return -EINVAL;
> + if (!pt) {
> + ret = -EINVAL;
> + goto put_fence;
> + }
>
> spin_lock_irqsave(fence->lock, flags);
> - if (test_bit(SW_SYNC_HAS_DEADLINE_BIT, &fence->flags)) {
> - data.deadline_ns = ktime_to_ns(pt->deadline);
> - } else {
> + if (!test_bit(SW_SYNC_HAS_DEADLINE_BIT, &fence->flags)) {
> ret = -ENOENT;
> + goto unlock;
> }
> + data.deadline_ns = ktime_to_ns(pt->deadline);
> spin_unlock_irqrestore(fence->lock, flags);
>
> dma_fence_put(fence);
> @@ -458,6 +460,13 @@ static int sw_sync_ioctl_get_deadline(struct sync_timeline *obj, unsigned long a
> return -EFAULT;
>
> return 0;
> +
> +unlock:
> + spin_unlock_irqrestore(fence->lock, flags);
> +put_fence:
> + dma_fence_put(fence);
> +
> + return ret;
> }
>
> static long sw_sync_ioctl(struct file *file, unsigned int cmd,
prev parent reply other threads:[~2025-04-11 13:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-08 11:01 Dan Carpenter
2025-04-11 13:20 ` Christian König [this message]
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=f30552b0-36a7-4a56-a117-44e9eb3a14bf@amd.com \
--to=christian.koenig@amd.com \
--cc=dan.carpenter@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gustavo@padovan.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=lumag@kernel.org \
--cc=pekka.paalanen@collabora.com \
--cc=robdclark@chromium.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 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®