UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

of_net: remove nvmem-mac-address property 

In commit d01f449c00 ("of_net: add NVMEM support to
of_get_mac_address") I've added `nvmem-mac-address` property which was
wrong idea as I've allocated the property with devm_kzalloc and then
added it to DT, so then 2 entities would be refcounting the allocation.
So if the driver unbinds, the buffer is freed, but DT code would be
still referencing that memory.

I'm removing this property completely instead of fixing it, as it's not
needed to have it.

Fixes: d01f449c00 ("of_net: add NVMEM support to of_get_mac_address")
Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Petr Štetiar 2019-05-10 11:35:14 +02:00 committed by David S. Miller
parent 0655f9943d
commit 265749861a
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/of/of_net.c
View File

@ -52,39 +52,22 @@ static const void *of_get_mac_addr(struct device_node *np, const char *name)
static const void *of_get_mac_addr_nvmem(struct device_node *np) static const void *of_get_mac_addr_nvmem(struct device_node *np)
{ {
int ret; int ret;
u8 mac[ETH_ALEN]; const void *mac;
struct property *pp; u8 nvmem_mac[ETH_ALEN];
struct platform_device *pdev = of_find_device_by_node(np); struct platform_device *pdev = of_find_device_by_node(np);
if (!pdev) if (!pdev)
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
ret = nvmem_get_mac_address(&pdev->dev, &mac); ret = nvmem_get_mac_address(&pdev->dev, &nvmem_mac);
if (ret) if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
pp = devm_kzalloc(&pdev->dev, sizeof(*pp), GFP_KERNEL); mac = devm_kmemdup(&pdev->dev, nvmem_mac, ETH_ALEN, GFP_KERNEL);
if (!pp) if (!mac)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
pp->name = "nvmem-mac-address"; return mac;
pp->length = ETH_ALEN;
pp->value = devm_kmemdup(&pdev->dev, mac, ETH_ALEN, GFP_KERNEL);
if (!pp->value) {
ret = -ENOMEM;
goto free;
}
ret = of_add_property(np, pp);
if (ret)
goto free;
return pp->value;
free:
devm_kfree(&pdev->dev, pp->value);
devm_kfree(&pdev->dev, pp);
return ERR_PTR(ret);
} }
/** /**