[PATCH 1/1] [media] exynos4-is: Fix potential null pointer dereference in mipi-csis.c

[PATCH 1/1] [media] exynos4-is: Fix potential null pointer dereference in mipi-csis.c

[Sachin Kamat]

When 'node' is NULL, the print statement tries to dereference it.
Remove it from the error message.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/exynos4-is/mipi-csis.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index a2eda9d..6ddc69f 100644
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -745,8 +745,7 @@ static int s5pcsis_parse_dt(struct platform_device *pdev,
 
 	node = v4l2_of_get_next_endpoint(node, NULL);
 	if (!node) {
-		dev_err(&pdev->dev, "No port node at %s\n",
-					node->full_name);
+		dev_err(&pdev->dev, "Port node not available\n");
 		return -EINVAL;
 	}
 	/* Get port node and validate MIPI-CSI channel id. */
-- 
1.7.9.5

Re: [PATCH 1/1] [media] exynos4-is: Fix potential null pointer dereference in mipi-csis.c

[Sylwester Nawrocki]

On 04/26/2013 06:44 AM, Sachin Kamat wrote:
> When 'node' is NULL, the print statement tries to dereference it.
> Remove it from the error message.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/media/platform/exynos4-is/mipi-csis.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
> index a2eda9d..6ddc69f 100644
> --- a/drivers/media/platform/exynos4-is/mipi-csis.c
> +++ b/drivers/media/platform/exynos4-is/mipi-csis.c
> @@ -745,8 +745,7 @@ static int s5pcsis_parse_dt(struct platform_device *pdev,
>  
>  	node = v4l2_of_get_next_endpoint(node, NULL);
>  	if (!node) {
> -		dev_err(&pdev->dev, "No port node at %s\n",
> -					node->full_name);
> +		dev_err(&pdev->dev, "Port node not available\n");

Thanks Sachin. Could you instead do
s/node->full_name/pdev->dev.of_node->full_name ?

This way we won't loose any information and it would be easier to
determine which node exactly is wrong.

Re: [PATCH 1/1] [media] exynos4-is: Fix potential null pointer dereference in mipi-csis.c

[Sachin Kamat]

Hi Sylwester,

On 26 April 2013 14:22, Sylwester Nawrocki <s.nawrocki@samsung.com> wrote:
> On 04/26/2013 06:44 AM, Sachin Kamat wrote:
>> When 'node' is NULL, the print statement tries to dereference it.
>> Remove it from the error message.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> ---
>>  drivers/media/platform/exynos4-is/mipi-csis.c |    3 +--
>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
>> index a2eda9d..6ddc69f 100644
>> --- a/drivers/media/platform/exynos4-is/mipi-csis.c
>> +++ b/drivers/media/platform/exynos4-is/mipi-csis.c
>> @@ -745,8 +745,7 @@ static int s5pcsis_parse_dt(struct platform_device *pdev,
>>
>>       node = v4l2_of_get_next_endpoint(node, NULL);
>>       if (!node) {
>> -             dev_err(&pdev->dev, "No port node at %s\n",
>> -                                     node->full_name);
>> +             dev_err(&pdev->dev, "Port node not available\n");
>
> Thanks Sachin. Could you instead do
> s/node->full_name/pdev->dev.of_node->full_name ?
>
> This way we won't loose any information and it would be easier to
> determine which node exactly is wrong.

Certainly. I too wanted to provide this information in print message
but could not think of an alternative way
immediately. Thanks for the tip.


-- 
With warm regards,
Sachin