29a3967e61
Calling free for the OF property can result in a kernel panic, as the
buffer in question might be referenced elsewhere. Also, it is not
removed from the tree.
Always allocate a new property and updating the tree with it fixes both
issues.
Fixes commit 91a52f22a1 ("treewide: backport support for nvmem on non platform devices")
Signed-off-by: David Bauer <mail@david-bauer.net>
38 lines
862 B
Diff
38 lines
862 B
Diff
--- a/drivers/of/of_net.c
|
|
+++ b/drivers/of/of_net.c
|
|
@@ -135,6 +135,26 @@ static int of_get_mac_address_mtd(struct
|
|
return -EINVAL;
|
|
}
|
|
|
|
+static int of_add_mac_address(struct device_node *np, u8* addr)
|
|
+{
|
|
+ struct property *prop;
|
|
+
|
|
+ prop = kzalloc(sizeof(*prop), GFP_KERNEL);
|
|
+ if (!prop)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ prop->name = "mac-address";
|
|
+ prop->length = ETH_ALEN;
|
|
+ prop->value = kmemdup(addr, ETH_ALEN, GFP_KERNEL);
|
|
+ if (!prop->value || of_update_property(np, prop))
|
|
+ goto free;
|
|
+
|
|
+ return 0;
|
|
+free:
|
|
+ kfree(prop->value);
|
|
+ kfree(prop);
|
|
+ return -ENOMEM;
|
|
+}
|
|
|
|
/**
|
|
* Search the device tree for the best MAC address to use. 'mac-address' is
|
|
@@ -210,6 +230,7 @@ found:
|
|
if (!of_property_read_u32(np, "mac-address-increment", &mac_inc))
|
|
addr[inc_idx] += mac_inc;
|
|
|
|
+ of_add_mac_address(np, addr);
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(of_get_mac_address);
|