[v2] drm/amdgpu: prevent BO_HANDLES error from being overwritten

[PATCH v2] drm/amdgpu: prevent BO_HANDLES error from being overwritten

Posted by Mohammed Anees 1 year, 4 months ago

Before this patch, if multiple BO_HANDLES chunks were submitted,
the error -EINVAL would be correctly set but could be overwritten
by the return value from amdgpu_cs_p1_bo_handles(). This patch
ensures that if there are multiple BO_HANDLES, we stop.

Cc: stable@vger.kernel.org
Fixes: fec5f8e8c6bc ("drm/amdgpu: disallow multiple BO_HANDLES chunks in one submit")
Signed-off-by: Mohammed Anees <pvmohammedanees2003@gmail.com>
---
v2:
- Switched to goto free_partial_kdata for error handling, following the existing pattern.
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 1e475eb01417..d891ab779ca7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -265,7 +265,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
 
 			/* Only a single BO list is allowed to simplify handling. */
 			if (p->bo_list)
-				ret = -EINVAL;
+				goto free_partial_kdata;
 
 			ret = amdgpu_cs_p1_bo_handles(p, p->chunks[i].kdata);
 			if (ret)
-- 
2.46.0

Re: [PATCH v2] drm/amdgpu: prevent BO_HANDLES error from being overwritten

Posted by Christian König 1 year, 4 months ago

Am 09.10.24 um 14:28 schrieb Mohammed Anees:
> Before this patch, if multiple BO_HANDLES chunks were submitted,
> the error -EINVAL would be correctly set but could be overwritten
> by the return value from amdgpu_cs_p1_bo_handles(). This patch
> ensures that if there are multiple BO_HANDLES, we stop.
>
> Cc: stable@vger.kernel.org
> Fixes: fec5f8e8c6bc ("drm/amdgpu: disallow multiple BO_HANDLES chunks in one submit")
> Signed-off-by: Mohammed Anees <pvmohammedanees2003@gmail.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

@Pierre-Eric can you pick that one up and push to amd-staging-drm-next?

Alex is currently on XDC and I'm a bit busy as well.

Thanks,
Christian.

> ---
> v2:
> - Switched to goto free_partial_kdata for error handling, following the existing pattern.
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 1e475eb01417..d891ab779ca7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -265,7 +265,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
>   
>   			/* Only a single BO list is allowed to simplify handling. */
>   			if (p->bo_list)
> -				ret = -EINVAL;
> +				goto free_partial_kdata;
>   
>   			ret = amdgpu_cs_p1_bo_handles(p, p->chunks[i].kdata);
>   			if (ret)

Re: [PATCH v2] drm/amdgpu: prevent BO_HANDLES error from being overwritten

Posted by Pierre-Eric Pelloux-Prayer 1 year, 4 months ago

Thanks for the updated patch, looks good to me.

Le 09/10/2024 à 14:31, Christian König a écrit :
> Am 09.10.24 um 14:28 schrieb Mohammed Anees:
>> Before this patch, if multiple BO_HANDLES chunks were submitted,
>> the error -EINVAL would be correctly set but could be overwritten
>> by the return value from amdgpu_cs_p1_bo_handles(). This patch
>> ensures that if there are multiple BO_HANDLES, we stop.
>>
>> Cc: stable@vger.kernel.org
>> Fixes: fec5f8e8c6bc ("drm/amdgpu: disallow multiple BO_HANDLES chunks in one submit")
>> Signed-off-by: Mohammed Anees <pvmohammedanees2003@gmail.com>
> 
> Reviewed-by: Christian König <christian.koenig@amd.com>
> 
> @Pierre-Eric can you pick that one up and push to amd-staging-drm-next?
> 
> Alex is currently on XDC and I'm a bit busy as well.

Sure, will do.

Pierre-Eric

> 
> Thanks,
> Christian.
> 
>> ---
>> v2:
>> - Switched to goto free_partial_kdata for error handling, following the existing pattern.
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
>> index 1e475eb01417..d891ab779ca7 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
>> @@ -265,7 +265,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
>>               /* Only a single BO list is allowed to simplify handling. */
>>               if (p->bo_list)
>> -                ret = -EINVAL;
>> +                goto free_partial_kdata;
>>               ret = amdgpu_cs_p1_bo_handles(p, p->chunks[i].kdata);
>>               if (ret)