Skip to contentSkip to conversation

connman: fix segfault with musl >v1.1.21

PATCH In review Nicola Lunghi 2 participants 2 messages May 23, 2019 – May 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 connman: fix segfault with musl >v1.1.21

musl > v1.1.21 changed the implementation of the freeaddrinfo() function not allowing anymore to pass null pointers to it.
This was causing a segmentation fault in connman.

---
 ...-gweb-fix-segfault-with-musl-v1.1.21.patch | 34 +++++++++++++++++++
 .../connman/connman_1.37.bb                   |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch
meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch new file +34 -0
new file mode 100644
index 0000000000..43b43bc9f8
@@ -0,0 +1,34 @@
+From f0a8c69971b30ea7ca255bb885fdd1179fa5d298 Mon Sep 17 00:00:00 2001
+From: Nicola Lunghi <[email protected]>
+Date: Thu, 23 May 2019 07:55:25 +0100
+Subject: [PATCH] gweb: fix segfault with musl v1.1.21
+
+In musl > v1.1.21 freeaddrinfo() implementation changed and
+was causing a segmentation fault on recent Yocto using musl.
+
+See this commit:
+
+ https://git.musl-libc.org/cgit/musl/commit/src/network/freeaddrinfo.c?id=d1395c43c019aec6b855cf3c656bf47c8a719e7f
+
+Upstream-Status: Submitted
+---
+ gweb/gweb.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gweb/gweb.c b/gweb/gweb.c
+index 393afe0a..12fcb1d8 100644
+--- a/gweb/gweb.c
++++ b/gweb/gweb.c
+@@ -1274,7 +1274,8 @@ static bool is_ip_address(const char *host)
+ 	addr = NULL;
+ 
+ 	result = getaddrinfo(host, NULL, &hints, &addr);
+-	freeaddrinfo(addr);
++	if(!result)
++		freeaddrinfo(addr);
+ 
+ 	return result == 0;
+ }
+-- 
+2.19.1
+
meta/recipes-connectivity/connman/connman_1.37.bb +1 -0
index 2cf904cd85..12650329c5 100644
@@ -3,6 +3,7 @@ require connman.inc
 SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
             file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
             file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
+            file://0001-gweb-fix-segfault-with-musl-v1.1.21.patch \
             file://connman \
             file://no-version-scripts.patch \
 "
Signature · 1 line
2.20.1
#1 lore raw
Quoted 3 lines · Nicola Lunghi

musl > v1.1.21 changed the implementation of the freeaddrinfo() function not allowing anymore to pass null pointers to it.
This was causing

Looks ok. We had similar issue with nfs-utils

https://patchwork.openembedded.org/patch/156772/

a segmentation fault in connman.

Quoted 61 lines
---
  ...-gweb-fix-segfault-with-musl-v1.1.21.patch | 34 +++++++++++++++++++
  .../connman/connman_1.37.bb                   |  1 +
  2 files changed, 35 insertions(+)

create mode 100644 meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch

meta/recipes-connectivity/connman/connman/0001-gweb-fix-segfault-with-musl-v1.1.21.patch new file +34 -0
new file mode 100644
index 0000000000..43b43bc9f8
@@ -0,0 +1,34 @@
+From f0a8c69971b30ea7ca255bb885fdd1179fa5d298 Mon Sep 17 00:00:00 2001
+From: Nicola Lunghi <[email protected]>
+Date: Thu, 23 May 2019 07:55:25 +0100
+Subject: [PATCH] gweb: fix segfault with musl v1.1.21
+
+In musl > v1.1.21 freeaddrinfo() implementation changed and
+was causing a segmentation fault on recent Yocto using musl.
+
+See this commit:
+
+ https://git.musl-libc.org/cgit/musl/commit/src/network/freeaddrinfo.c?id=d1395c43c019aec6b855cf3c656bf47c8a719e7f
+
+Upstream-Status: Submitted
+---
+ gweb/gweb.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gweb/gweb.c b/gweb/gweb.c
+index 393afe0a..12fcb1d8 100644
+--- a/gweb/gweb.c
++++ b/gweb/gweb.c
+@@ -1274,7 +1274,8 @@ static bool is_ip_address(const char *host)
+ 	addr = NULL;
+
+ 	result = getaddrinfo(host, NULL, &hints, &addr);
+-	freeaddrinfo(addr);
++	if(!result)
++		freeaddrinfo(addr);
+
+ 	return result == 0;
+ }
+--
+2.19.1
+
meta/recipes-connectivity/connman/connman_1.37.bb +1 -0
index 2cf904cd85..12650329c5 100644
@@ -3,6 +3,7 @@ require connman.inc
  SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
              file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
              file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
+            file://0001-gweb-fix-segfault-with-musl-v1.1.21.patch \
              file://connman \
              file://no-version-scripts.patch \
  "