drm/amdgpu: debugfs: fix error codes in write functions
Subsystems (3)
PATCH 1/2 drm/amdgpu: debugfs: fix error codes in write functions
There are two error code bugs here. The copy_to/from_user() functions return the number of bytes remaining (a positive number). We should return -EFAULT if the copy fails.
Second if we fail because "context.resp_status" is non-zero then return -EINVAL instead of zero.
---
There are a bunch of exit paths where copy_from_user() fails and this function returns -EINVAL which is wrong as well. If the copy fails it should be -EFAULT. If the data is bad, then -EINVAL.
drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c +14 -6
@@ -159,9 +159,10 @@ static ssize_t ta_if_load_debugfs_write(struct file *fp, const char *buf, size_t ta_bin =kzalloc (ta_bin_len,GFP_KERNEL );if (!ta_bin) ret = -ENOMEM ; - ret =copy_from_user ((void *)ta_bin, &buf[copy_pos], ta_bin_len); -if (ret) +if (copy_from_user ((void *)ta_bin, &buf[copy_pos], ta_bin_len)) { + ret = -EFAULT ; goto err_free_bin; + } ret =psp_ras_terminate (psp);if (ret) {
@@ -180,11 +181,14 @@ static ssize_t ta_if_load_debugfs_write(struct file *fp, const char *buf, size_tif (ret || context.resp_status) {dev_err (adev->dev,"TA load via debugfs failed (%d) status %d\n" , ret, context.resp_status); +if (!ret) + ret = -EINVAL ; goto err_free_bin; } context.initialized = true; - ret =copy_to_user ((char *)buf, (void *)&context.session_id,sizeof (uint32_t )); +if (copy_to_user ((char *)buf, (void *)&context.session_id,sizeof (uint32_t ))) + ret = -EFAULT ; err_free_bin:kfree (ta_bin);
@@ -251,9 +255,10 @@ static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf, size shared_buf =kzalloc (shared_buf_len,GFP_KERNEL );if (!shared_buf) ret = -ENOMEM ; - ret =copy_from_user ((void *)shared_buf, &buf[copy_pos], shared_buf_len); -if (ret) +if (copy_from_user ((void *)shared_buf, &buf[copy_pos], shared_buf_len)) { + ret = -EFAULT ; goto err_free_shared_buf; + } context.session_id = ta_id;
@@ -264,10 +269,13 @@ static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf, sizeif (ret || context.resp_status) {dev_err (adev->dev,"TA invoke via debugfs failed (%d) status %d\n" , ret, context.resp_status); +if (!ret) + ret = -EINVAL ; goto err_free_ta_shared_buf; } - ret =copy_to_user ((char *)buf, context.mem_context.shared_buf, shared_buf_len); +if (copy_to_user ((char *)buf, context.mem_context.shared_buf, shared_buf_len)) + ret = -EFAULT ; err_free_ta_shared_buf:psp_ta_free_shared_buf (&context.mem_context);
Signature · 1 line
2.35.1
PATCH 2/2 drm/amdgpu: debugfs: fix NULL dereference in ta_if_invoke_debugfs_write()
If the kzalloc() fails then this code will crash. Return -ENOMEM instead.
---
This would look nicer as:
shared_buf = memdup_user(&buf[copy_pos], shared_buf_len); if (IS_ERR(shared_buf)) return PTR_ERR(shared_buf);
Probably eventually this will be sent as an automated Coccinelle patch?
drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c +1 -1
@@ -254,7 +254,7 @@ static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf, size shared_buf =kzalloc (shared_buf_len,GFP_KERNEL );if (!shared_buf) - ret = -ENOMEM ; +return -ENOMEM ;if (copy_from_user ((void *)shared_buf, &buf[copy_pos], shared_buf_len)) { ret = -EFAULT ; goto err_free_shared_buf;
Signature · 1 line
2.35.1
Alex Deucher
AppliedRe: [PATCH 2/2] drm/amdgpu: debugfs: fix NULL dereference in ta_if_invoke_debugfs_write()
Applied the series. Thanks!
Alex
Quoted 33 lines · Dan Carpenter
If the
kzalloc()fails then this code will crash. Return-ENOMEMinstead.Fixes e50d9ba0d2cd ("drm/amdgpu: Add debugfs TA load/unload/invoke support")Signed-off-by Dan Carpenter <[email protected]>---
This would look nicer as:shared_buf = memdup_user(&buf[copy_pos], shared_buf_len); if (IS_ERR(shared_buf)) return PTR_ERR(shared_buf);Probably eventually this will be sent as an automated Coccinelle patch?
drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c +1
-2@@ -254,7 +254,7 @@ static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf, size shared_buf =kzalloc (shared_buf_len,GFP_KERNEL );if (!shared_buf) - ret = -ENOMEM ; +return -ENOMEM ;if (copy_from_user ((void *)shared_buf, &buf[copy_pos], shared_buf_len)) { ret = -EFAULT ; goto err_free_shared_buf; --2.35.1
Re: [PATCH 2/2] drm/amdgpu: debugfs: fix NULL dereference in ta_if_invoke_debugfs_write()
Alex--
Quoted 4 lines · Alex Deucher
Applied the series. Thanks!
Alex
I just saw a build warning here when CONFIG_DEBUG_FS is not enabled:
../drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c:281:23: warning: 'amdgpu_ta_if_debugfs_create' defined but not used [-Wunused-function]
281 | static struct dentry *amdgpu_ta_if_debugfs_create(struct amdgpu_device *adev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
Signature · 1 line
~Randy