Commit e96c37f1 authored by Francesco Ruggeri's avatar Francesco Ruggeri Committed by David S. Miller

macvtap: check minor when unregistering

macvtap_device_event(NETDEV_UNREGISTER) should check vlan->minor to
determine if it is being invoked in the context of a macvtap_newlink
that failed, for example in this code sequence:

macvtap_newlink
  macvlan_common_newlink
    register_netdevice
      call_netdevice_notifiers(NETDEV_REGISTER, dev)
        macvtap_device_event(NETDEV_REGISTER)
          <fail here, vlan->minor = 0>
      rollback_registered(dev);
        rollback_registered_many
          call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
            macvtap_device_event(NETDEV_UNREGISTER)
              <nothing to clean up here>
Signed-off-by: default avatarFrancesco Ruggeri <fruggeri@arista.com>
Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30837960
...@@ -1303,6 +1303,9 @@ static int macvtap_device_event(struct notifier_block *unused, ...@@ -1303,6 +1303,9 @@ static int macvtap_device_event(struct notifier_block *unused,
} }
break; break;
case NETDEV_UNREGISTER: case NETDEV_UNREGISTER:
/* vlan->minor == 0 if NETDEV_REGISTER above failed */
if (vlan->minor == 0)
break;
devt = MKDEV(MAJOR(macvtap_major), vlan->minor); devt = MKDEV(MAJOR(macvtap_major), vlan->minor);
device_destroy(macvtap_class, devt); device_destroy(macvtap_class, devt);
macvtap_free_minor(vlan); macvtap_free_minor(vlan);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment