Fix segfault in connman-gnome
cover Fix segfault in connman-gnome
Unfortunately this segfault did not show up until I was able to test connecting to a wifi network from a Poky system at runtime; all other tests passed (including the same operation on an Ubuntu system).
The following changes since commit 4e1a8ed1ab7e7bd950e511c79ddfe072cb280a6e:
bitbake.conf: Include abi_version.conf in a early stage (2012-04-16 12:51:50 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/connman-gnome-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/connman-gnome-fix
Paul Eggleton (1):
connman-gnome: fix segfault on connect
...me-fix-segfault-due-to-unchecked-null-val.patch | 30 ++++++++++++++++++++ .../connman/connman-gnome_0.5.bb | 5 ++- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/connman/connman-gnome/0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch
Signature · 1 line
1.7.5.4
PATCH 1/1 connman-gnome: fix segfault on connect
Fixes a segfault in the properties application when connecting to a WiFi service succeeds.
--- ...me-fix-segfault-due-to-unchecked-null-val.patch | 30 ++++++++++++++++++++ .../connman/connman-gnome_0.5.bb | 5 ++- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/connman/connman-gnome/0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch
meta/recipes-connectivity/connman/connman-gnome/0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 7225bf8e8e9bee42d7d7d02ba754b9fb30a877b6 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <[email protected]> +Date: Mon, 16 Apr 2012 19:15:35 +0100 +Subject: [PATCH] connman-gnome: fix segfault due to unchecked null value + +If value is NULL here we should not pass it to g_value_get_boxed(). + +Upstream-Status: Submitted + +Signed-off-by: Paul Eggleton <[email protected]> +--- + common/connman-dbus.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/common/connman-dbus.c b/common/connman-dbus.c +index 33ac623..822fc98 100644 +--- a/common/connman-dbus.c ++++ b/common/connman-dbus.c +@@ -437,7 +437,7 @@ static void service_properties(DBusGProxy *proxy, GHashTable *hash, + DBG("name %s type %d icon %s", name, type, icon); + + value = g_hash_table_lookup(hash, "IPv4.Configuration"); +- ipv4 = g_value_get_boxed (value); ++ ipv4 = value ? g_value_get_boxed (value) : NULL; + + if (!ipv4) + goto done; +-- +1.7.5.4 +
meta/recipes-connectivity/connman/connman-gnome_0.5.bb +3 -2
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ DEPENDS = "gtk+ dbus" -PR = "r9" +PR = "r10" SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5" SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \
@@ -17,7 +17,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \ file://0003-Fix-setting-IPv4-configuration.patch \ file://0004-Handle-WiFi-authentication-using-an-agent.patch \ file://0005-Remove-all-handling-of-Passphrase-property.patch \ - file://0006-Fix-status-descriptions-in-properties-tree.patch" + file://0006-Fix-status-descriptions-in-properties-tree.patch \ + file://0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch" S = "${WORKDIR}/git"
Signature · 1 line
1.7.5.4
Saul Wold
AppliedRe: [PATCH 1/1] connman-gnome: fix segfault on connect
Quoted 60 lines · Paul Eggleton
Fixes a segfault in the properties application when connecting to a WiFi service succeeds.
Signed-off-by Paul Eggleton<[email protected]>--- ...me-fix-segfault-due-to-unchecked-null-val.patch | 30 ++++++++++++++++++++ .../connman/connman-gnome_0.5.bb | 5 ++- 2 files changed, 33 insertions(+), 2 deletions(-)create mode 100644
meta/recipes-connectivity/connman/connman-gnome/0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patchmeta/recipes-connectivity/connman/connman-gnome/0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch new file +30
-0@@ -0,0 +1,30 @@ +From 7225bf8e8e9bee42d7d7d02ba754b9fb30a877b6 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton<[email protected]> +Date: Mon, 16 Apr 2012 19:15:35 +0100 +Subject: [PATCH] connman-gnome: fix segfault due to unchecked null value + +If value is NULL here we should not pass it to g_value_get_boxed(). + +Upstream-Status: Submitted + +Signed-off-by: Paul Eggleton<[email protected]> +--- + common/connman-dbus.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/common/connman-dbus.c b/common/connman-dbus.c +index 33ac623..822fc98 100644 +--- a/common/connman-dbus.c ++++ b/common/connman-dbus.c +@@ -437,7 +437,7 @@ static void service_properties(DBusGProxy *proxy, GHashTable *hash, + DBG("name %s type %d icon %s", name, type, icon); + + value = g_hash_table_lookup(hash, "IPv4.Configuration"); +- ipv4 = g_value_get_boxed (value); ++ ipv4 = value ? g_value_get_boxed (value) : NULL; + + if (!ipv4) + goto done; +-- +1.7.5.4 +meta/recipes-connectivity/connman/connman-gnome_0.5.bb +1
-1@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ DEPENDS = "gtk+ dbus" -PR = "r9" +PR = "r10" SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5" SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \
meta/recipes-connectivity/connman/connman-gnome_0.5.bb SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \ · line 24
Quoted 9 lines
meta/recipes-connectivity/connman/connman-gnome_0.5.bb +2
-1@@ -17,7 +17,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \ file://0003-Fix-setting-IPv4-configuration.patch \ file://0004-Handle-WiFi-authentication-using-an-agent.patch \ file://0005-Remove-all-handling-of-Passphrase-property.patch \ - file://0006-Fix-status-descriptions-in-properties-tree.patch" + file://0006-Fix-status-descriptions-in-properties-tree.patch \ + file://0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch" S = "${WORKDIR}/git"
Merged into OE-Core
Thanks
Sau!