From 3cd83be02d871c549a815301578b0d29dec1510f Mon Sep 17 00:00:00 2001 From: Zang Ruochen Date: Fri, 22 May 2020 19:19:46 +0800 Subject: dnsmasq: upgrade 2.80 -> 2.81 -dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch -dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch Removed since these are included in 2.81 Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj (cherry picked from commit 36ece5c83f20f4fc923f1606979ea911ecb93da8) Signed-off-by: Armin Kuster --- ...001-dnsmasq-fix-build-against-5.2-headers.patch | 31 -------------- .../0001-dnsmasq-fix-memory-leak-in-helper-c.patch | 49 ---------------------- .../recipes-support/dnsmasq/dnsmasq_2.80.bb | 10 ----- .../recipes-support/dnsmasq/dnsmasq_2.81.bb | 8 ++++ 4 files changed, 8 insertions(+), 90 deletions(-) delete mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch delete mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch delete mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb (limited to 'meta-networking/recipes-support') diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch deleted file mode 100644 index 844a709856..0000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-build-against-5.2-headers.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 52f4b58c14a2788ca08b7d8884d586724d86fc66 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Mon, 19 Aug 2019 14:46:02 +0000 -Subject: [PATCH] dnsmasq: fix build against 5.2 headers - -Upstream linux y2038 work has moved some definitions SIOCGSTAMP is -defined in linux/sockios.h, not asm/sockios.h now. So we need to -add that include to fix the build. - -Upstream-status: backport of http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=3052ce208acf602f0163166dcefb7330d537cedb - -Signed-off-by: Bruce Ashfield ---- - a/src/dnsmasq.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build/tmp/work/core2-64-poky-linux/dnsmasq/2.80-r0/dnsmasq-2.80/src/dnsmasq.h b/build/tmp/work/core2-64-poky-linux/dnsmasq/2.80-r0/dnsmasq-2.80/src/dnsmasq.h -index f53e9a5be6..d9225ea473 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -138,6 +138,7 @@ typedef unsigned long long u64; - #endif - - #if defined(HAVE_LINUX_NETWORK) -+#include - #include - /* There doesn't seem to be a universally-available - userspace header for these. */ --- -2.19.1 - diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch deleted file mode 100644 index ccd6f82ae8..0000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq/0001-dnsmasq-fix-memory-leak-in-helper-c.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Wed, 14 Aug 2019 20:44:50 +0100 -Subject: [PATCH] Fix memory leak in helper.c - -Thanks to Xu Mingjie for spotting this. - -CVE: CVE-2019-14834 -Upstream-Status: Backport -Signed-off-by: Zhixiong Chi ---- - src/helper.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/helper.c b/src/helper.c -index 33ba120..c392eec 100644 ---- a/src/helper.c -+++ b/src/helper.c -@@ -82,7 +82,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) - pid_t pid; - int i, pipefd[2]; - struct sigaction sigact; -- -+ unsigned char *alloc_buff = NULL; -+ - /* create the pipe through which the main program sends us commands, - then fork our process. */ - if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1) -@@ -188,11 +189,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) - struct script_data data; - char *p, *action_str, *hostname = NULL, *domain = NULL; - unsigned char *buf = (unsigned char *)daemon->namebuff; -- unsigned char *end, *extradata, *alloc_buff = NULL; -+ unsigned char *end, *extradata; - int is6, err = 0; - int pipeout[2]; - -- free(alloc_buff); -+ /* Free rarely-allocated memory from previous iteration. */ -+ if (alloc_buff) -+ { -+ free(alloc_buff); -+ alloc_buff = NULL; -+ } - - /* we read zero bytes when pipe closed: this is our signal to exit */ - if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1)) --- -1.7.10.4 diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb deleted file mode 100644 index 827565051d..0000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.80.bb +++ /dev/null @@ -1,10 +0,0 @@ -require dnsmasq.inc - -SRC_URI[dnsmasq-2.80.md5sum] = "1f071fd11454e1cffea73bdadcf70b21" -SRC_URI[dnsmasq-2.80.sha256sum] = "9e4a58f816ce0033ce383c549b7d4058ad9b823968d352d2b76614f83ea39adc" -SRC_URI += "\ - file://lua.patch \ - file://0001-dnsmasq-fix-build-against-5.2-headers.patch \ - file://0001-dnsmasq-fix-memory-leak-in-helper-c.patch \ -" - diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb new file mode 100644 index 0000000000..92415386c2 --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb @@ -0,0 +1,8 @@ +require dnsmasq.inc + +SRC_URI[dnsmasq-2.81.md5sum] = "e43808177a773014b5892ccba238f7a8" +SRC_URI[dnsmasq-2.81.sha256sum] = "3c28c68c6c2967c3a96e9b432c0c046a5df17a426d3a43cffe9e693cf05804d0" +SRC_URI += "\ + file://lua.patch \ +" + -- cgit 1.2.3-korg