From: Tom Gundersen <teg@jklm.no>
Date: Mon, 29 Jun 2015 12:23:17 +0000 (+0200)
Subject: networkd: fix segfault when cancelling callbacks
X-Git-Tag: v222~44^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b024a9cfb1bee0aa8e143f46db11a4c2a58fb798;p=thirdparty%2Fsystemd.git

networkd: fix segfault when cancelling callbacks

This only happens when something has gone wrong, so is not easy to hit. However,
if a bridge (say) is configured on a system without bridge support we will hit
this.

Fixes issue #299.
---

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index ece9ecc2511..73d3b6bf6c2 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -92,7 +92,7 @@ static void netdev_cancel_callbacks(NetDev *netdev) {
                         assert(netdev->manager);
                         assert(netdev->manager->rtnl);
 
-                        callback->callback(netdev->manager->rtnl, m, link);
+                        callback->callback(netdev->manager->rtnl, m, callback->link);
                 }
 
                 LIST_REMOVE(callbacks, netdev->callbacks, callback);