drm/vmwgfx: Return error code from vmw_execbuf_copy_fence_user

thomashvmw · thomashvmw · commit 728354c005c3 · 2019-02-05T13:50:53.000+01:00
The function was unconditionally returning 0, and a caller would have to rely on the returned fence pointer being NULL to detect errors. However, the function vmw_execbuf_copy_fence_user() would expect a non-zero error code in that case and would BUG otherwise. So make sure we return a proper non-zero error code if the fence pointer returned is NULL. Cc: <stable@vger.kernel.org> Fixes: ae2a104: ("vmwgfx: Implement fence objects") Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Deepak Rawat <drawat@vmware.com>
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -3570,7 +3570,7 @@ int vmw_execbuf_fence_commands(struct drm_file *file_priv,
 		*p_fence = NULL;
 	}
 
-	return 0;
+	return ret;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -3570,7 +3570,7 @@ int vmw_execbuf_fence_commands(struct drm_file *file_priv,`
`3570`	`3570`	`*p_fence = NULL;`
`3571`	`3571`	`}`
`3572`	`3572`
`3573`		`- return 0;`
	`3573`	`+ return ret;`
`3574`	`3574`	`}`
`3575`	`3575`
`3576`	`3576`	`/**`