diff options
| author | Tom Gundersen <teg@jklm.no> | 2013-10-27 23:09:05 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2013-10-27 23:09:05 +0100 |
| commit | 2a73e0d39a9bec82c3800071e375d27164727e71 (patch) | |
| tree | 7a81f8712ffa3cd4daff87395760652df6747862 /src/udev/net | |
| parent | eab97a4666453ab905932260d59ab4a0aed081e7 (diff) | |
udev: link-config - sanity check the ifname and mac address
Diffstat (limited to 'src/udev/net')
| -rw-r--r-- | src/udev/net/link-config.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 902ed0955d..bb0640589b 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -20,6 +20,7 @@ ***/ #include <netinet/ether.h> +#include <net/if.h> #include "link-config.h" @@ -252,6 +253,8 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_confi static int rtnl_set_properties(sd_rtnl *rtnl, int ifindex, const char *name, const char *mac, unsigned int mtu) { _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *message; + char new_name[IFNAMSIZ]; + struct ether_addr new_mac; bool need_update; int r; @@ -263,7 +266,8 @@ static int rtnl_set_properties(sd_rtnl *rtnl, int ifindex, const char *name, con return r; if (name) { - r = sd_rtnl_message_append(message, IFLA_IFNAME, name); + strscpy(new_name, IFNAMSIZ, name); + r = sd_rtnl_message_append(message, IFLA_IFNAME, new_name); if (r < 0) return r; @@ -271,7 +275,16 @@ static int rtnl_set_properties(sd_rtnl *rtnl, int ifindex, const char *name, con } if (mac) { - r = sd_rtnl_message_append(message, IFLA_ADDRESS, ether_aton(mac)); + r = sscanf(mac, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", + &new_mac.ether_addr_octet[0], + &new_mac.ether_addr_octet[1], + &new_mac.ether_addr_octet[2], + &new_mac.ether_addr_octet[3], + &new_mac.ether_addr_octet[4], + &new_mac.ether_addr_octet[5]); + if (r != 6) + return -EINVAL; + r = sd_rtnl_message_append(message, IFLA_ADDRESS, &new_mac); if (r < 0) return r; |