linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iommu/qcom:fix local_base status check
@ 2020-04-02  6:33 Tang Bin
  2020-04-02  6:45 ` Bjorn Andersson
  2020-04-16 10:05 ` Robin Murphy
  0 siblings, 2 replies; 9+ messages in thread
From: Tang Bin @ 2020-04-02  6:33 UTC (permalink / raw)
  To: agross, bjorn.andersson, robdclark
  Cc: joro, linux-arm-msm, iommu, linux-kernel, Tang Bin

Release resources when exiting on error.

Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
---
 drivers/iommu/qcom_iommu.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
index 4328da0b0..c08aa9651 100644
--- a/drivers/iommu/qcom_iommu.c
+++ b/drivers/iommu/qcom_iommu.c
@@ -813,8 +813,11 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
 	qcom_iommu->dev = dev;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (res)
+	if (res) {
 		qcom_iommu->local_base = devm_ioremap_resource(dev, res);
+		if (IS_ERR(qcom_iommu->local_base))
+			return PTR_ERR(qcom_iommu->local_base);
+	}
 
 	qcom_iommu->iface_clk = devm_clk_get(dev, "iface");
 	if (IS_ERR(qcom_iommu->iface_clk)) {
-- 
2.20.1.windows.1




^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH] iommu/qcom:fix local_base status check
  2020-04-02  6:33 [PATCH] iommu/qcom:fix local_base status check Tang Bin
@ 2020-04-02  6:45 ` Bjorn Andersson
  2020-04-16  6:42   ` Tang Bin
  2020-04-16 10:05 ` Robin Murphy
  1 sibling, 1 reply; 9+ messages in thread
From: Bjorn Andersson @ 2020-04-02  6:45 UTC (permalink / raw)
  To: Tang Bin; +Cc: agross, robdclark, joro, linux-arm-msm, iommu, linux-kernel

On Wed 01 Apr 23:33 PDT 2020, Tang Bin wrote:

> Release resources when exiting on error.
> 

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Regards,
Bjorn

> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
> ---
>  drivers/iommu/qcom_iommu.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
> index 4328da0b0..c08aa9651 100644
> --- a/drivers/iommu/qcom_iommu.c
> +++ b/drivers/iommu/qcom_iommu.c
> @@ -813,8 +813,11 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
>  	qcom_iommu->dev = dev;
>  
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	if (res)
> +	if (res) {
>  		qcom_iommu->local_base = devm_ioremap_resource(dev, res);
> +		if (IS_ERR(qcom_iommu->local_base))
> +			return PTR_ERR(qcom_iommu->local_base);
> +	}
>  
>  	qcom_iommu->iface_clk = devm_clk_get(dev, "iface");
>  	if (IS_ERR(qcom_iommu->iface_clk)) {
> -- 
> 2.20.1.windows.1
> 
> 
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] iommu/qcom:fix local_base status check
  2020-04-02  6:45 ` Bjorn Andersson
@ 2020-04-16  6:42   ` Tang Bin
  2020-04-18 11:54     ` Joerg Roedel
  0 siblings, 1 reply; 9+ messages in thread
From: Tang Bin @ 2020-04-16  6:42 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: agross, robdclark, joro, linux-arm-msm, iommu, linux-kernel

Hi Bjorn:

On 2020/4/2 14:45, Bjorn Andersson wrote:
> On Wed 01 Apr 23:33 PDT 2020, Tang Bin wrote:
>
>> Release resources when exiting on error.
>>
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Thanks for your positive feedback.

I don't know whether the commit message affect this patch's result. If 
so, I think the commit message need more clarification. As follwos:

         The function qcom_iommu_device_probe() does not perform 
sufficient error checking after executing devm_ioremap_resource(), which 
can result in crashes if a critical error path is encountered.

Fixes: 0ae349a0("iommu/qcom: Add qcom_iommu")


I'm waiting for your reply actively.

Thanks,

Tang Bin


>
>> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
>> ---
>>   drivers/iommu/qcom_iommu.c | 5 ++++-
>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
>> index 4328da0b0..c08aa9651 100644
>> --- a/drivers/iommu/qcom_iommu.c
>> +++ b/drivers/iommu/qcom_iommu.c
>> @@ -813,8 +813,11 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
>>   	qcom_iommu->dev = dev;
>>   
>>   	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> -	if (res)
>> +	if (res) {
>>   		qcom_iommu->local_base = devm_ioremap_resource(dev, res);
>> +		if (IS_ERR(qcom_iommu->local_base))
>> +			return PTR_ERR(qcom_iommu->local_base);
>> +	}
>>   
>>   	qcom_iommu->iface_clk = devm_clk_get(dev, "iface");
>>   	if (IS_ERR(qcom_iommu->iface_clk)) {
>> -- 
>> 2.20.1.windows.1
>>
>>
>>



^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] iommu/qcom:fix local_base status check
  2020-04-02  6:33 [PATCH] iommu/qcom:fix local_base status check Tang Bin
  2020-04-02  6:45 ` Bjorn Andersson
@ 2020-04-16 10:05 ` Robin Murphy
  2020-04-16 10:12   ` Tang Bin
  1 sibling, 1 reply; 9+ messages in thread
From: Robin Murphy @ 2020-04-16 10:05 UTC (permalink / raw)
  To: Tang Bin, agross, bjorn.andersson, robdclark
  Cc: linux-arm-msm, iommu, linux-kernel

On 2020-04-02 7:33 am, Tang Bin wrote:
> Release resources when exiting on error.
> 
> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
> ---
>   drivers/iommu/qcom_iommu.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
> index 4328da0b0..c08aa9651 100644
> --- a/drivers/iommu/qcom_iommu.c
> +++ b/drivers/iommu/qcom_iommu.c
> @@ -813,8 +813,11 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
>   	qcom_iommu->dev = dev;
>   
>   	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	if (res)
> +	if (res) {
>   		qcom_iommu->local_base = devm_ioremap_resource(dev, res);
> +		if (IS_ERR(qcom_iommu->local_base))
> +			return PTR_ERR(qcom_iommu->local_base);
> +	}

...or just use devm_platform_ioremap_resource() to make the whole thing 
simpler.

Robin.

>   
>   	qcom_iommu->iface_clk = devm_clk_get(dev, "iface");
>   	if (IS_ERR(qcom_iommu->iface_clk)) {
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] iommu/qcom:fix local_base status check
  2020-04-16 10:05 ` Robin Murphy
@ 2020-04-16 10:12   ` Tang Bin
  0 siblings, 0 replies; 9+ messages in thread
From: Tang Bin @ 2020-04-16 10:12 UTC (permalink / raw)
  To: Robin Murphy, agross, bjorn.andersson, robdclark
  Cc: linux-arm-msm, iommu, linux-kernel


On 2020/4/16 18:05, Robin Murphy wrote:
> On 2020-04-02 7:33 am, Tang Bin wrote:
>> Release resources when exiting on error.
>>
>> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
>> ---
>>   drivers/iommu/qcom_iommu.c | 5 ++++-
>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
>> index 4328da0b0..c08aa9651 100644
>> --- a/drivers/iommu/qcom_iommu.c
>> +++ b/drivers/iommu/qcom_iommu.c
>> @@ -813,8 +813,11 @@ static int qcom_iommu_device_probe(struct 
>> platform_device *pdev)
>>       qcom_iommu->dev = dev;
>>         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> -    if (res)
>> +    if (res) {
>>           qcom_iommu->local_base = devm_ioremap_resource(dev, res);
>> +        if (IS_ERR(qcom_iommu->local_base))
>> +            return PTR_ERR(qcom_iommu->local_base);
>> +    }
>
> ...or just use devm_platform_ioremap_resource() to make the whole 
> thing simpler.
Yes, I was going to simplify the code here, but status check is still 
required.

So I'm waiting.

Thanks,

Tang Bin




^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] iommu/qcom:fix local_base status check
  2020-04-16  6:42   ` Tang Bin
@ 2020-04-18 11:54     ` Joerg Roedel
  2020-04-18 13:08       ` Tang Bin
  0 siblings, 1 reply; 9+ messages in thread
From: Joerg Roedel @ 2020-04-18 11:54 UTC (permalink / raw)
  To: Tang Bin
  Cc: Bjorn Andersson, agross, robdclark, linux-arm-msm, iommu, linux-kernel

On Thu, Apr 16, 2020 at 02:42:23PM +0800, Tang Bin wrote:
>         The function qcom_iommu_device_probe() does not perform sufficient
> error checking after executing devm_ioremap_resource(), which can result in
> crashes if a critical error path is encountered.
> 
> Fixes: 0ae349a0("iommu/qcom: Add qcom_iommu")

Yes, that sounds better. Please use it for the commit message and also
add the Fixes line and resubmit the fix to me.
Please make the fixes line:

	Fixes: 0ae349a0f33f ("iommu/qcom: Add qcom_iommu")

So that the commit-id is 12 characters long and a space between it and
the subject.

Thanks,

	Joerg


^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] iommu/qcom:fix local_base status check
  2020-04-18 11:54     ` Joerg Roedel
@ 2020-04-18 13:08       ` Tang Bin
  0 siblings, 0 replies; 9+ messages in thread
From: Tang Bin @ 2020-04-18 13:08 UTC (permalink / raw)
  To: Joerg Roedel
  Cc: Bjorn Andersson, agross, robdclark, linux-arm-msm, iommu, linux-kernel


On 2020/4/18 19:54, Joerg Roedel wrote:
> On Thu, Apr 16, 2020 at 02:42:23PM +0800, Tang Bin wrote:
>>          The function qcom_iommu_device_probe() does not perform sufficient
>> error checking after executing devm_ioremap_resource(), which can result in
>> crashes if a critical error path is encountered.
>>
>> Fixes: 0ae349a0("iommu/qcom: Add qcom_iommu")
> Yes, that sounds better. Please use it for the commit message and also
> add the Fixes line and resubmit the fix to me.
> Please make the fixes line:
>
> 	Fixes: 0ae349a0f33f ("iommu/qcom: Add qcom_iommu")
>
> So that the commit-id is 12 characters long and a space between it and
> the subject.

Got it, thanks for your instruction.

Tang Bin

>
>



^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] iommu/qcom:fix local_base status check
  2020-04-01 15:20 Tang Bin
@ 2020-04-01 23:36 ` Bjorn Andersson
  0 siblings, 0 replies; 9+ messages in thread
From: Bjorn Andersson @ 2020-04-01 23:36 UTC (permalink / raw)
  To: Tang Bin; +Cc: robdclark, agross, joro, linux-arm-msm, linux-kernel

On Wed 01 Apr 08:20 PDT 2020, Tang Bin wrote:

> Release resources when exiting on error.
> 
> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
> ---
>  drivers/iommu/qcom_iommu.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
> index 4328da0b0..d4ec38b1e 100644
> --- a/drivers/iommu/qcom_iommu.c
> +++ b/drivers/iommu/qcom_iommu.c
> @@ -815,6 +815,8 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	if (res)
>  		qcom_iommu->local_base = devm_ioremap_resource(dev, res);
> +		if (IS_ERR(qcom_iommu->local_base))

Good catch! But while it works, this is not under the if (res). So
please add some {} around this chunk.

Regards,
Bjorn

> +			return PTR_ERR(qcom_iommu->local_base);
>  
>  	qcom_iommu->iface_clk = devm_clk_get(dev, "iface");
>  	if (IS_ERR(qcom_iommu->iface_clk)) {
> -- 
> 2.20.1.windows.1
> 
> 
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] iommu/qcom:fix local_base status check
@ 2020-04-01 15:20 Tang Bin
  2020-04-01 23:36 ` Bjorn Andersson
  0 siblings, 1 reply; 9+ messages in thread
From: Tang Bin @ 2020-04-01 15:20 UTC (permalink / raw)
  To: robdclark, agross
  Cc: bjorn.andersson, joro, linux-arm-msm, linux-kernel, Tang Bin

Release resources when exiting on error.

Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
---
 drivers/iommu/qcom_iommu.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c
index 4328da0b0..d4ec38b1e 100644
--- a/drivers/iommu/qcom_iommu.c
+++ b/drivers/iommu/qcom_iommu.c
@@ -815,6 +815,8 @@ static int qcom_iommu_device_probe(struct platform_device *pdev)
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (res)
 		qcom_iommu->local_base = devm_ioremap_resource(dev, res);
+		if (IS_ERR(qcom_iommu->local_base))
+			return PTR_ERR(qcom_iommu->local_base);
 
 	qcom_iommu->iface_clk = devm_clk_get(dev, "iface");
 	if (IS_ERR(qcom_iommu->iface_clk)) {
-- 
2.20.1.windows.1




^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-04-18 13:06 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-02  6:33 [PATCH] iommu/qcom:fix local_base status check Tang Bin
2020-04-02  6:45 ` Bjorn Andersson
2020-04-16  6:42   ` Tang Bin
2020-04-18 11:54     ` Joerg Roedel
2020-04-18 13:08       ` Tang Bin
2020-04-16 10:05 ` Robin Murphy
2020-04-16 10:12   ` Tang Bin
  -- strict thread matches above, loose matches on Subject: below --
2020-04-01 15:20 Tang Bin
2020-04-01 23:36 ` Bjorn Andersson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).