Hello community,
here is the log from the commit of package NetworkManager-applet for
openSUSE:Factory checked in at 2018-01-16 09:29:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-applet (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-applet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-applet"
Tue Jan 16 09:29:55 2018 rev:14 rq:564000 version:1.8.10
Changes:
--------
---
/work/SRC/openSUSE:Factory/NetworkManager-applet/NetworkManager-applet.changes
2018-01-06 18:46:13.323550280 +0100
+++
/work/SRC/openSUSE:Factory/.NetworkManager-applet.new/NetworkManager-applet.changes
2018-01-16 09:29:57.820525669 +0100
@@ -1,0 +2,9 @@
+Fri Jan 12 07:28:10 UTC 2018 - [email protected]
+
+- Add
+ 0001-shared-compat-fix-memory-handling-of-nm_setting_vpn_.patch
+ and
+ 0002-shared-compat-fix-memory-handling-of-nm_setting_vpn_.patch:
+ fix crashes due to double frees.
+
+-------------------------------------------------------------------
New:
----
0001-shared-compat-fix-memory-handling-of-nm_setting_vpn_.patch
0002-shared-compat-fix-memory-handling-of-nm_setting_vpn_.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-applet.spec ++++++
--- /var/tmp/diff_new_pack.SiKTWF/_old 2018-01-16 09:29:58.412497972 +0100
+++ /var/tmp/diff_new_pack.SiKTWF/_new 2018-01-16 09:29:58.412497972 +0100
@@ -1,7 +1,7 @@
#
# spec file for package NetworkManager-applet
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -41,6 +41,10 @@
Patch1: nm-applet-probe-radius-server-cert.patch
# PATCH-FIX-OPENSUSE
NetworkManager-gnome-bsc1003069-default-agent-owned-secrets.patch bsc#1003069
[email protected] -- Make sure secrets default to agent-owned (encrypted keyring).
Patch2:
NetworkManager-gnome-bsc1003069-default-agent-owned-secrets.patch
+# PATCH-FIX-UPSTREAM
0001-shared-compat-fix-memory-handling-of-nm_setting_vpn_.patch [email protected]
-- fix memory handling of nm_setting_vpn_get_*_keys
+Patch3: 0001-shared-compat-fix-memory-handling-of-nm_setting_vpn_.patch
+# PATCH-FIX-UPSTREAM
0002-shared-compat-fix-memory-handling-of-nm_setting_vpn_.patch [email protected]
-- fix memory handling of nm_setting_vpn_get_*_keys
+Patch4: 0002-shared-compat-fix-memory-handling-of-nm_setting_vpn_.patch
BuildRequires: gtk-doc
BuildRequires: intltool
%if %{with meson}
@@ -179,6 +183,8 @@
%patch1 -p1
%endif
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%if !0%{?is_opensuse}
translation-update-upstream
%endif
++++++ 0001-shared-compat-fix-memory-handling-of-nm_setting_vpn_.patch ++++++
>From 0c90e08f77b71d2bda699cf032fceec0122bbf82 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <[email protected]>
Date: Wed, 20 Dec 2017 13:23:12 +0100
Subject: [PATCH] shared/compat: fix memory handling of
nm_setting_vpn_get_*_keys
The compat implementations return a (transfer none) strv instead of a
(transfer container) one. This has caused double frees in nm-applet:
https://bugs.archlinux.org/task/56772
Don't copy the keys and don't free the container later.
[[email protected]: patch adjusted to avoid compiler warning]
Patch imported from NetworkManager commit
8ac8c01162235c2c198bfaf25fb7d1a57a595ce5.
Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
---
shared/nm-utils/nm-compat.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
index 22ab675d..47035e62 100644
--- a/shared/nm-utils/nm-compat.c
+++ b/shared/nm-utils/nm-compat.c
@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer
user_data)
{
GPtrArray *a = user_data;
- g_ptr_array_add (a, g_strdup (key));
+ g_ptr_array_add (a, (gpointer) key);
}
static const char **
@@ -55,14 +55,6 @@ _get_keys (NMSettingVpn *setting,
g_ptr_array_sort (a, nm_strcmp_p);
g_ptr_array_add (a, NULL);
keys = (const char **) g_ptr_array_free (g_steal_pointer (&a),
FALSE);
-
- /* we need to cache the keys *somewhere*. */
- g_object_set_qdata_full (G_OBJECT (setting),
- is_secrets
- ? NM_CACHED_QUARK
("libnm._nm_setting_vpn_get_secret_keys")
- : NM_CACHED_QUARK
("libnm._nm_setting_vpn_get_data_keys"),
- keys,
- (GDestroyNotify) g_strfreev);
}
NM_SET_OUT (out_length, len);
--
2.15.1
++++++ 0002-shared-compat-fix-memory-handling-of-nm_setting_vpn_.patch ++++++
>From a52ccb2fe170558fc0aab4dd1d15ba8808b10951 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <[email protected]>
Date: Thu, 21 Dec 2017 20:36:48 +0100
Subject: [PATCH] shared/compat: fix memory handling of
nm_setting_vpn_get_*_keys()
The previous fix was bad because the keys do not come from NMSettingVpn's hash
table but are copies that are freed by nm_setting_vpn_foreach_* before
it returns.
[[email protected]: import shared code from NetworkManager, merging
three patches together.]
Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
Fixes: 0c90e08f77b71d2bda699cf032fceec0122bbf82
https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00069.html
https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00070.html
---
shared/nm-utils/nm-compat.c | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
index 47035e62..90328c06 100644
--- a/shared/nm-utils/nm-compat.c
+++ b/shared/nm-utils/nm-compat.c
@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer
user_data)
{
GPtrArray *a = user_data;
- g_ptr_array_add (a, (gpointer) key);
+ g_ptr_array_add (a, g_strdup (key));
}
static const char **
@@ -40,22 +40,37 @@ _get_keys (NMSettingVpn *setting,
{
guint len;
const char **keys = NULL;
- gs_unref_ptrarray GPtrArray *a = NULL;
+ GPtrArray *a;
nm_assert (NM_IS_SETTING_VPN (setting));
- a = g_ptr_array_new ();
+ if (is_secrets)
+ len = nm_setting_vpn_get_num_secrets (setting);
+ else
+ len = nm_setting_vpn_get_num_data_items (setting);
+
+ a = g_ptr_array_sized_new (len + 1);
+
if (is_secrets)
nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a);
else
nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a);
- len = a->len;
- if (a->len) {
+ len = a->len;
+ if (len) {
g_ptr_array_sort (a, nm_strcmp_p);
g_ptr_array_add (a, NULL);
- keys = (const char **) g_ptr_array_free (g_steal_pointer (&a),
FALSE);
- }
+ keys = g_memdup (a->pdata, a->len * sizeof (gpointer));
+
+ /* we need to cache the keys *somewhere*. */
+ g_object_set_qdata_full (G_OBJECT (setting),
+ is_secrets
+ ? NM_CACHED_QUARK
("libnm._nm_setting_vpn_get_secret_keys")
+ : NM_CACHED_QUARK
("libnm._nm_setting_vpn_get_data_keys"),
+ g_ptr_array_free (a, FALSE),
+ (GDestroyNotify) g_strfreev);
+ } else
+ g_ptr_array_free (a, TRUE);
NM_SET_OUT (out_length, len);
return keys;
--
2.15.1
