From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795025055; b=Yw1eLqyfoqHEw6ZT+1M00170idpivctMk2xcX/QCHu3CpRdWfy6hgz7wQl7VfsNuCS97 xB5qWPPsAoaOGzdqmpehb4086jKU0hE4FOOGGwUJslIdyBfmmL+K5OxaIH+KL0YUGDUri wvpUBFFwPo5jMojt9vPi+dW40PhQ78pSy94t1JRrrJc/hC9nib1IJ0xIoho3YUgj80/NO 9BHG0haVSh0OmtzPwBbWTJ4tba9botyi8B1nwwYWwCZwAIX9EdnDR7omX3kbKQ2gyP8hv nvy8fc27RxcBYvq1kQ3qIfdZMfgPy6pgSYL09ncus9EHpjNKeVQRt4X5SYOAKJwu1YQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795025055; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=J4P1Ly7JGXlyFYxsY3qHLHxvWJx3fwLwP5HUjf0gRsc=; b=MSyRH30cJz/q0O39tKrR/yl+sprvQOv3AqgpcQcWDhMwJpYrAGJFS1q7fLuhyZL1mMjj N5XH/ys+btFE31Dm0QcALBcfbyFahQggUzvbM4s4Twx7N1sQW+6VdedHyhw706m8t6tBR uDhWZgdzb62T1czMz/TgwDrCLtPudsV1oMI+OJNsEomd8PHFzogEsQy+6Youfd0r0amWL jSd9JTUiFrqE2Mx1YzuAuk1rTjlGaa8nKK4j9qTgxhvLCNahhMA7XrgdbykSkU6TFhndj WM45Dkk/bj4ysGwy6I5RllayaUPZeEluHZEnTzOIgIP0uoIiw2Q+QWwjS078PwRLCjQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=q3Rm+QnS; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF6D5606A31C; Wed, 18 Nov 2026 18:04:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=q3Rm+QnS Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13FD51F000C4; Wed, 18 Nov 2026 18:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795025055; bh=J4P1Ly7JGXlyFYxsY3qHLHxvWJx3fwLwP5HUjf0gRsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=q3Rm+QnSIjiN6TpzggnbQAJxg2hqrrnyzlvwiA8heZkwdIZ88p0vdmZ9SfvIbayFp 7Jc8N2gYo1HIsRDtgLZlV1HZ6tHRjXJLFbSSWLYxOyu0LNW1ZJMdvQATZZO4jsnM60 aoiqe7zyE/85sSwsSleK74/Oksr9RYIUgwVGp1v4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Mikko Perttunen , Thierry Reding , Sasha Levin Subject: [PATCH 6.18 0945/2151] drm/tegra: Fix syncobj_in wait return value check Date: Wed, 18 Nov 2026 15:44:40 +0100 Message-ID: <20261118150156.898542497@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mikko Perttunen [ Upstream commit 27836c46a3db5a7869a9f7e181136f0c4d8bc0d1 ] dma_fence_wait_timeout() returns the remaining timeout in jiffies on success, zero on timeout, and a negative error code if interrupted. The return value was assigned to 'err' and checked as if it were an errno, the opposite of the correct logic. Fix the code to use a properly typed variable and check each condition correctly. Fixes: 13abe0bb15ce ("drm/tegra: Implement job submission part of new UAPI") Reported-by: Dan Carpenter Closes: https://lore.kernel.org/all/aJM_te551jUwnRv7@stanley.mountain/ Signed-off-by: Mikko Perttunen Signed-off-by: Thierry Reding Link: https://patch.msgid.link/20260730-b4-host1x-syncobj-wait-v1-1-afa730410392@nvidia.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/tegra/submit.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/tegra/submit.c b/drivers/gpu/drm/tegra/submit.c index 705382035f5f6..f35e5c3ff37cd 100644 --- a/drivers/gpu/drm/tegra/submit.c +++ b/drivers/gpu/drm/tegra/submit.c @@ -530,6 +530,7 @@ int tegra_drm_ioctl_channel_submit(struct drm_device *drm, void *data, if (args->syncobj_in) { struct dma_fence *fence; + long wait_err; err = drm_syncobj_find_fence(file, args->syncobj_in, 0, 0, &fence); if (err) { @@ -537,10 +538,15 @@ int tegra_drm_ioctl_channel_submit(struct drm_device *drm, void *data, goto unlock; } - err = dma_fence_wait_timeout(fence, true, msecs_to_jiffies(10000)); + wait_err = dma_fence_wait_timeout(fence, true, msecs_to_jiffies(10000)); dma_fence_put(fence); - if (err) { + if (wait_err == 0) { SUBMIT_ERR(context, "wait for syncobj_in timed out"); + err = -ETIMEDOUT; + goto unlock; + } else if (wait_err < 0) { + /* In practice, -ERESTARTSYS */ + err = wait_err; goto unlock; } } -- 2.53.0