connman-gnome:fix DHCP segfault
v2 cover connman-gnome:fix DHCP segfault
Update older patch for YB3945.
The following changes since commit 199b1a8c7d7109d9b59d67bf4dcfeb03be07587a:
mkfontscale: This no longer needs a full libx11, xproto suffices (2013-08-22 18:30:06 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib mihaip/b3945
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mihaip/b3945
Mihai Prica (1):
connman-gnome: fix DHCP segfault
.../connman-gnome/null_check_for_ipv4_config.patch | 36 ++++++++++++++++++++ .../connman/connman-gnome_0.7.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch
Signature · 1 line
1.7.9.5
PATCH v2 1/1 connman-gnome: fix DHCP segfault
In networks that don't have a DHCP server configured, ipv4 address allocation fails and the ipv4 structure doesn't get populated. The patch checks this case also.
[YOCTO #3945]
Signed-off-by Mihai Prica <[email protected]>
Signed-off-by Emilia Ciobanu <emilia.maria.silvia.ciobanu at intel.com>
--- .../connman-gnome/null_check_for_ipv4_config.patch | 36 ++++++++++++++++++++ .../connman/connman-gnome_0.7.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch
meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch new file +36 -0
@@ -0,0 +1,36 @@ +In networks that don't have a DHCP server configured, ipv4 address +allocation fails and the ipv4 structure doesn't get populated. When +the GUI is trying to read the ipv4_config.method field to see whether +it contains "dhcp" string, a segmentation fault is generated. + +Ethernet manual configuration behavior remains unchanged after this fix. + +Upstream-Status: Pending + +Signed-off-by: Emilia Ciobanu <[email protected]> +Index: git/properties/ethernet.c +=================================================================== +--- git.orig/properties/ethernet.c ++++ git/properties/ethernet.c +@@ -194,7 +194,7 @@ void add_ethernet_service(GtkWidget *mai + + data->button = button; + +- if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) ++ if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == TRUE) + update_ethernet_ipv4(data, CONNMAN_POLICY_DHCP); + else + update_ethernet_ipv4(data, CONNMAN_POLICY_MANUAL); +Index: git/properties/wifi.c +=================================================================== +--- git.orig/properties/wifi.c ++++ git/properties/wifi.c +@@ -230,7 +230,7 @@ static void wifi_ipconfig(GtkWidget *tab + + data->ipv4_config = ipv4_config; + +- if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) ++ if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == TRUE) + update_wifi_ipv4(data, CONNMAN_POLICY_DHCP); + else + update_wifi_ipv4(data, CONNMAN_POLICY_MANUAL);
meta/recipes-connectivity/connman/connman-gnome_0.7.bb +1 -0
@@ -12,6 +12,7 @@ DEPENDS = "gtk+ dbus-glib intltool-native" SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143" SRC_URI = "git://github.com/connectivity/connman-gnome.git;protocol=git \ file://0001-Removed-icon-from-connman-gnome-about-applet.patch \ + file://null_check_for_ipv4_config.patch \ file://images/* \ "
--
1.7.9.5