about summary refs log tree commit diff
path: root/debian/patches/git_ifupdown_iterator.patch
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2019-04-02 17:59:54 +0200
committerSebastien Bacher <seb128@ubuntu.com>2019-04-02 17:59:54 +0200
commita86dd1a4b692a20aa56eea0e57425f0af48a0378 (patch)
treedf088e9061f8498c1cc8c473a016a03f6e371842 /debian/patches/git_ifupdown_iterator.patch
parent9d943e2d2144c874b71b24ecd1c653190eb92e16 (diff)
* debian/patches/git_ifupdown_iterator.patch:
  - ifupdown: fix connection iterator, should fix a segfault in the
    corresponding plugin (lp: #1815742)
Diffstat (limited to 'debian/patches/git_ifupdown_iterator.patch')
-rw-r--r--debian/patches/git_ifupdown_iterator.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches/git_ifupdown_iterator.patch b/debian/patches/git_ifupdown_iterator.patch
new file mode 100644
index 00000000..09279eb4
--- /dev/null
+++ b/debian/patches/git_ifupdown_iterator.patch
@@ -0,0 +1,30 @@
+From 00858afc4f0512e751f35a56e74dff2d5a4a4c07 Mon Sep 17 00:00:00 2001
+From: Yupeng Chang <changyp6@gmail.com>
+Date: Tue, 2 Apr 2019 11:30:29 +0200
+Subject: [PATCH] ifupdown: fix connection iterator
+
+Fixes: 6aa66426a416 ('settings/ifupdown: merge eni_ifaces and connections hashes in plugin')
+
+https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/145
+https://bugzilla.redhat.com/show_bug.cgi?id=1694912
+(cherry picked from commit 1dd67583e3eecba09ee983ef6a443ded64303846)
+---
+ src/settings/plugins/ifupdown/nms-ifupdown-plugin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+index 99a594776..9c9b73f28 100644
+--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
++++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+@@ -280,7 +280,7 @@ initialize (NMSettingsPlugin *plugin)
+ 		GHashTableIter iter;
+ 
+ 		g_hash_table_iter_init (&iter, priv->eni_ifaces);
+-		while (g_hash_table_iter_next (&iter, NULL, (gpointer *) conn)) {
++		while (g_hash_table_iter_next (&iter, NULL, (gpointer) &conn)) {
+ 			if (conn) {
+ 				_nm_settings_plugin_emit_signal_connection_added (NM_SETTINGS_PLUGIN (self),
+ 				                                                  NM_SETTINGS_CONNECTION (conn));
+-- 
+2.18.1
+