hwaddr: change hwaddr only when valid (bnc#898622)

openSUSE · Sep 26, 2014 · 69b63d4 · 69b63d4
1 parent ff0c845
commit 69b63d4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/dbus-objects/dummy.c b/src/dbus-objects/dummy.c
@@ -169,7 +169,8 @@ ni_objectmodel_dummy_change(ni_dbus_object_t *object, const ni_dbus_method_t *me
 
 	if (cfg->link.hwaddr.type == ARPHRD_VOID)
 		cfg->link.hwaddr.type = ARPHRD_ETHER;
-	if (ni_system_hwaddr_change(nc, dev, &cfg->link.hwaddr) < 0) {
+	if (!ni_link_address_is_invalid(&cfg->link.hwaddr) &&
+	    ni_system_hwaddr_change(nc, dev, &cfg->link.hwaddr) < 0) {
 		ni_error("Unable to change hwaddr on dummy interface %s",
 				dev->name);
 		/* fail? */

diff --git a/src/dbus-objects/ethernet.c b/src/dbus-objects/ethernet.c
@@ -61,7 +61,8 @@ ni_objectmodel_ethernet_setup(ni_dbus_object_t *object, const ni_dbus_method_t *
 	} else {
 		if (cfg->link.hwaddr.type == ARPHRD_VOID)
 			cfg->link.hwaddr.type = ARPHRD_ETHER;
-		if (ni_system_hwaddr_change(nc, ifp, &cfg->link.hwaddr) < 0) {
+		if (!ni_link_address_is_invalid(&cfg->link.hwaddr) &&
+		    ni_system_hwaddr_change(nc, ifp, &cfg->link.hwaddr) < 0) {
 			ni_error("Unable to change hwaddr on ethernet interface %s",
 				ifp->name);
 		}

diff --git a/src/dbus-objects/macvlan.c b/src/dbus-objects/macvlan.c
@@ -325,7 +325,8 @@ __ni_objectmodel_macvlan_change(ni_netdev_t *cfg, ni_netdev_t *dev, DBusError *e
 
 	if (cfg->link.hwaddr.type == ARPHRD_VOID)
 		cfg->link.hwaddr.type = ARPHRD_ETHER;
-	if (ni_system_hwaddr_change(nc, dev, &cfg->link.hwaddr) < 0) {
+	if (!ni_link_address_is_invalid(&cfg->link.hwaddr) &&
+	    ni_system_hwaddr_change(nc, dev, &cfg->link.hwaddr) < 0) {
 		ni_error("Unable to change hwaddr on %s interface %s",
 			dev_iftype, dev->name);
 		/* fail? */

diff --git a/src/dbus-objects/tuntap.c b/src/dbus-objects/tuntap.c
@@ -236,7 +236,8 @@ ni_objectmodel_tuntap_change(ni_dbus_object_t *object, const ni_dbus_method_t *m
 
 	if (cfg->link.hwaddr.type == ARPHRD_VOID)
 		cfg->link.hwaddr.type = ARPHRD_ETHER;
-	if (ni_system_hwaddr_change(nc, dev, &cfg->link.hwaddr) < 0) {
+	if (!ni_link_address_is_invalid(&cfg->link.hwaddr) &&
+	    ni_system_hwaddr_change(nc, dev, &cfg->link.hwaddr) < 0) {
 		ni_error("Unable to change hwaddr on %s interface %s",
 				iftype_name, dev->name);
 		/* fail? */

diff --git a/src/dbus-objects/vlan.c b/src/dbus-objects/vlan.c
@@ -226,7 +226,8 @@ ni_objectmodel_vlan_change(ni_dbus_object_t *object, const ni_dbus_method_t *met
 
 	if (cfg->link.hwaddr.type == ARPHRD_VOID)
 		cfg->link.hwaddr.type = ARPHRD_ETHER;
-	if (ni_system_hwaddr_change(nc, dev, &cfg->link.hwaddr) < 0) {
+	if (!ni_link_address_is_invalid(&cfg->link.hwaddr) &&
+	    ni_system_hwaddr_change(nc, dev, &cfg->link.hwaddr) < 0) {
 		ni_error("Unable to change hwaddr on vlan interface %s",
 			dev->name);
 		/* fail? */