Commit d27326a9 authored by Dan Carpenter's avatar Dan Carpenter Committed by Christian König
Browse files

dma-buf/sw_sync: Decrement refcount on error in sw_sync_ioctl_get_deadline() 



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: 70e67aae ("dma-buf/sw_sync: Add fence deadline support")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a010a1ac-107b-4fc0-a052-9fd3706ad690@stanley.mountain


Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
parent 31660b40

drivers/dma-buf/sw_sync.c

+14 −5
Original line number Diff line number Diff line
@@ -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,