| Message ID | 1413951386-29645-2-git-send-email-varkab@cdac.in |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 10/22/2014 8:16 AM, Varka Bhadram wrote: > devm_ioremap_resource checks platform_get_resource() return value. > We can remove the duplicate check here. > Signed-off-by: Varka Bhadram <varkab@cdac.in> > --- > drivers/net/ethernet/wiznet/w5100.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c > index 0f56b1c..bf195e3 100644 > --- a/drivers/net/ethernet/wiznet/w5100.c > +++ b/drivers/net/ethernet/wiznet/w5100.c > @@ -638,8 +638,7 @@ static int w5100_hw_probe(struct platform_device *pdev) > } > > mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - if (!mem) > - return -ENXIO; > + > mem_size = resource_size(mem); This would cause a NULL dereference on resource_size() call if 'mem' is NULL. You can't remove the NULL check because of that. > > priv->base = devm_ioremap_resource(&pdev->dev, mem); > WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/22/2014 05:13 PM, Sergei Shtylyov wrote: > Hello. > > On 10/22/2014 8:16 AM, Varka Bhadram wrote: > >> devm_ioremap_resource checks platform_get_resource() return value. >> We can remove the duplicate check here. > >> Signed-off-by: Varka Bhadram <varkab@cdac.in> >> --- >> drivers/net/ethernet/wiznet/w5100.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) > >> diff --git a/drivers/net/ethernet/wiznet/w5100.c >> b/drivers/net/ethernet/wiznet/w5100.c >> index 0f56b1c..bf195e3 100644 >> --- a/drivers/net/ethernet/wiznet/w5100.c >> +++ b/drivers/net/ethernet/wiznet/w5100.c >> @@ -638,8 +638,7 @@ static int w5100_hw_probe(struct platform_device >> *pdev) >> } >> >> mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> - if (!mem) >> - return -ENXIO; >> + >> mem_size = resource_size(mem); > > This would cause a NULL dereference on resource_size() call if > 'mem' is NULL. You can't remove the NULL check because of that. > Ok i will fix it . Thankx for the review. >> >> priv->base = devm_ioremap_resource(&pdev->dev, mem); >> > > WBR, Sergei >
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 0f56b1c..bf195e3 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c @@ -638,8 +638,7 @@ static int w5100_hw_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) - return -ENXIO; + mem_size = resource_size(mem); priv->base = devm_ioremap_resource(&pdev->dev, mem);
devm_ioremap_resource checks platform_get_resource() return value. We can remove the duplicate check here. Signed-off-by: Varka Bhadram <varkab@cdac.in> --- drivers/net/ethernet/wiznet/w5100.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)