diff mbox series

reset: uniphier-glue: Fix possible null-ptr-deref

Message ID 20221114004958.258513-1-tanghui20@huawei.com
State New
Headers
Series reset: uniphier-glue: Fix possible null-ptr-deref |

Commit Message

Hui Tang Nov. 14, 2022, 12:49 a.m. UTC 
  It will cause null-ptr-deref when resource_size(res) invoked,
if platform_get_resource() returns NULL.

Fixes: 499fef09a323 ("reset: uniphier: add USB3 core reset control")
Signed-off-by: Hui Tang <tanghui20@huawei.com>
---
 drivers/reset/reset-uniphier-glue.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Kunihiko Hayashi Nov. 14, 2022, 1:09 a.m. UTC | #1 
On 2022/11/14 9:49, Hui Tang wrote:
> It will cause null-ptr-deref when resource_size(res) invoked,
> if platform_get_resource() returns NULL.
> 
> Fixes: 499fef09a323 ("reset: uniphier: add USB3 core reset control")
> Signed-off-by: Hui Tang <tanghui20@huawei.com>
> ---
>   drivers/reset/reset-uniphier-glue.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/reset/reset-uniphier-glue.c
> b/drivers/reset/reset-uniphier-glue.c
> index 146fd5d45e99..15abac9fc72c 100644
> --- a/drivers/reset/reset-uniphier-glue.c
> +++ b/drivers/reset/reset-uniphier-glue.c
> @@ -47,7 +47,6 @@ static int uniphier_glue_reset_probe(struct
> platform_device *pdev)
>   	struct device *dev = &pdev->dev;
>   	struct uniphier_glue_reset_priv *priv;
>   	struct resource *res;
> -	resource_size_t size;
>   	int i, ret;
>   
>   	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> @@ -60,7 +59,6 @@ static int uniphier_glue_reset_probe(struct
> platform_device *pdev)
>   		return -EINVAL;
>   
>   	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	size = resource_size(res);
>   	priv->rdata.membase = devm_ioremap_resource(dev, res);
>   	if (IS_ERR(priv->rdata.membase))
>   		return PTR_ERR(priv->rdata.membase);
> @@ -96,7 +94,7 @@ static int uniphier_glue_reset_probe(struct
> platform_device *pdev)
>   
>   	spin_lock_init(&priv->rdata.lock);
>   	priv->rdata.rcdev.owner = THIS_MODULE;
> -	priv->rdata.rcdev.nr_resets = size * BITS_PER_BYTE;
> +	priv->rdata.rcdev.nr_resets = resource_size(res) * BITS_PER_BYTE;
>   	priv->rdata.rcdev.ops = &reset_simple_ops;
>   	priv->rdata.rcdev.of_node = dev->of_node;
>   	priv->rdata.active_low = true;

Good catch! resource_size() should refer to res after the check.

Reviewed-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>

Thank you,

---
Best Regards
Kunihiko Hayashi
Philipp Zabel Jan. 3, 2023, 10:51 a.m. UTC | #2 
On Mo, 2022-11-14 at 08:49 +0800, Hui Tang wrote:
> It will cause null-ptr-deref when resource_size(res) invoked,
> if platform_get_resource() returns NULL.
> 
> Fixes: 499fef09a323 ("reset: uniphier: add USB3 core reset control")
> Signed-off-by: Hui Tang <tanghui20@huawei.com>

Thank you, applied to reset/fixes.

regards
Philipp
diff mbox series

Patch

diff --git a/drivers/reset/reset-uniphier-glue.c b/drivers/reset/reset-uniphier-glue.c
index 146fd5d45e99..15abac9fc72c 100644
--- a/drivers/reset/reset-uniphier-glue.c
+++ b/drivers/reset/reset-uniphier-glue.c
@@ -47,7 +47,6 @@  static int uniphier_glue_reset_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct uniphier_glue_reset_priv *priv;
 	struct resource *res;
-	resource_size_t size;
 	int i, ret;
 
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -60,7 +59,6 @@  static int uniphier_glue_reset_probe(struct platform_device *pdev)
 		return -EINVAL;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	size = resource_size(res);
 	priv->rdata.membase = devm_ioremap_resource(dev, res);
 	if (IS_ERR(priv->rdata.membase))
 		return PTR_ERR(priv->rdata.membase);
@@ -96,7 +94,7 @@  static int uniphier_glue_reset_probe(struct platform_device *pdev)
 
 	spin_lock_init(&priv->rdata.lock);
 	priv->rdata.rcdev.owner = THIS_MODULE;
-	priv->rdata.rcdev.nr_resets = size * BITS_PER_BYTE;
+	priv->rdata.rcdev.nr_resets = resource_size(res) * BITS_PER_BYTE;
 	priv->rdata.rcdev.ops = &reset_simple_ops;
 	priv->rdata.rcdev.of_node = dev->of_node;
 	priv->rdata.active_low = true;