From 66b35bc5a2eeb6135a8353544af84bef341538ef Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 1 Jun 2018 12:08:14 +0200 Subject: [PATCH] Revert "platform/wifi: do not double-free nl_msg" I've applied this without much thinking. Despite applying cleanly it doesn't do the right thing before nm_auto_nlmsg was introduced. Whoops. This reverts commit bc41a9ba75943252f2237a97b628f927961ab154. --- src/platform/wifi/wifi-utils-nl80211.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c index 87af18663a..a5f25b0269 100644 --- a/src/platform/wifi/wifi-utils-nl80211.c +++ b/src/platform/wifi/wifi-utils-nl80211.c @@ -472,7 +472,8 @@ wifi_nl80211_set_mode (WifiData *data, const NM80211Mode mode) err = nl80211_send_and_recv (nl80211, msg, NULL, NULL); return err ? FALSE : TRUE; -nla_put_failure: + nla_put_failure: + nlmsg_free (msg); return FALSE; } @@ -490,6 +491,7 @@ wifi_nl80211_set_powersave (WifiData *data, guint32 powersave) return err ? FALSE : TRUE; nla_put_failure: + nlmsg_free (msg); return FALSE; } @@ -762,7 +764,8 @@ nl80211_get_ap_info (WifiDataNl80211 *nl80211, return; -nla_put_failure: + nla_put_failure: + nlmsg_free (msg); return; } @@ -812,6 +815,7 @@ wifi_nl80211_indicate_addressing_running (WifiData *data, gboolean running) return err ? FALSE : TRUE; nla_put_failure: + nlmsg_free (msg); return FALSE; } #endif