diff options
| author |   Tom Gundersen <teg@jklm.no> | 2014-07-01 19:41:45 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-07-01 20:33:30 +0200 |
| commit | 8900367cd26c148200b4788cd9ae05995ceeb74c (patch) | |
| tree | 280f5263dd0b96235258fb2560a833e59d098dae | |
| parent | man: file-hierarchy - emphasize /usr/lib/$arch-id instead of $libdir (diff) | |
| download | systemd-8900367cd26c148200b4788cd9ae05995ceeb74c.tar.gz systemd-8900367cd26c148200b4788cd9ae05995ceeb74c.tar.bz2 systemd-8900367cd26c148200b4788cd9ae05995ceeb74c.zip | |
networkd: netdev - take ref when creating netdevs
We were doing this correctly for when the callback takes the Link object, but
must also do it for the cases it takes the NetDev object.
| -rw-r--r-- | src/network/networkd-netdev.c | 8 | ||||
| -rw-r--r-- | src/network/networkd-veth.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index a53f04654..20917e334 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -224,7 +224,7 @@ static int netdev_enter_ready(NetDev *netdev) { /* callback for netdev's created without a backing Link */ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) { - NetDev *netdev = userdata; + _cleanup_netdev_unref_ NetDev *netdev = userdata; int r; assert(netdev->state != _NETDEV_STATE_INVALID); @@ -388,9 +388,11 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c if (link) r = sd_rtnl_call_async(netdev->manager->rtnl, req, callback, link, 0, NULL); - else + else { r = sd_rtnl_call_async(netdev->manager->rtnl, req, &netdev_create_handler, netdev, 0, NULL); - if (r < 0) { + + netdev_ref(netdev); + } if (r < 0) { log_error_netdev(netdev, "Could not send rtnetlink message: %s", strerror(-r)); return r; diff --git a/src/network/networkd-veth.c b/src/network/networkd-veth.c index 3584981cb..3eac90ba9 100644 --- a/src/network/networkd-veth.c +++ b/src/network/networkd-veth.c @@ -145,6 +145,8 @@ int netdev_create_veth(NetDev *netdev, sd_rtnl_message_handler_t callback) { return r; } + netdev_ref(netdev); + log_debug_netdev(netdev, "Creating veth netdev: %s", netdev_kind_to_string(netdev->kind)); |