Commit 74570e12 authored by Gyeyoung Baek's avatar Gyeyoung Baek Committed by Steven Price
Browse files

accel/rocket: Fix prep_bo ioctl leaking positive return from dma_resv_wait_timeout() 



dma_resv_wait_timeout() returns a positive 'remaining jiffies' value
on success, 0 on timeout, and -errno on failure.

rocket_ioctl_prep_bo() returns this 'long' result from an int-typed
ioctl handler, so positive values reach userspace as bogus errors.
Explicitly set ret to 0 on the success path.

Fixes: 525ad89d ("accel/rocket: Add IOCTLs for synchronizing memory accesses")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGyeyoung Baek <gye976@gmail.com>
Reviewed-by: default avatarTomeu Vizoso <tomeu@tomeuvizoso.net>
Link: https://patch.msgid.link/c0ebf83b345721701b22d8f5bc41c52c0ecf5e16.1776581974.git.gye976@gmail.com


Signed-off-by: default avatarSteven Price <steven.price@arm.com>
parent b15838b0

drivers/accel/rocket/rocket_gem.c

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ int rocket_ioctl_prep_bo(struct drm_device *dev, void *data, struct drm_file *fi 
	ret = dma_resv_wait_timeout(gem_obj->resv, DMA_RESV_USAGE_WRITE, true, timeout);

	if (!ret)

		ret = timeout ? -ETIMEDOUT : -EBUSY;

	else if (ret > 0)

		ret = 0;



	shmem_obj = &to_rocket_bo(gem_obj)->base;