63ce6fcd20
Fix mac address increment patch. Permit to overflow to the next
byte and correctly calculate the incremented mac.
Reported-by: Chen Minqiang <ptpt52@gmail.com>
Fixes: d284e6ef0f ("treewide: convert mtd-mac-address-increment* to generic implementation")
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
39 lines
872 B
Diff
39 lines
872 B
Diff
--- a/drivers/of/of_net.c
|
|
+++ b/drivers/of/of_net.c
|
|
@@ -95,6 +95,27 @@ static int of_get_mac_addr_nvmem(struct
|
|
return 0;
|
|
}
|
|
|
|
+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
|
|
* checked first, because that is supposed to contain to "most recent" MAC
|
|
@@ -171,6 +192,7 @@ found:
|
|
addr[5] = (mac_val >> 0) & 0xff;
|
|
}
|
|
|
|
+ of_add_mac_address(np, addr);
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(of_get_mac_address);
|