From d7e21fcab1e828d5818511fd9ca7f433ee9a3c0c Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Sun, 17 May 2020 10:18:19 -0700 Subject: net-nds/dnsmasq: drop old Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Patrick McLean --- .../files/dnsmasq-2.80-cve-2019-14834.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch (limited to 'net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch') diff --git a/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch b/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch deleted file mode 100644 index a44ceabece71..000000000000 --- a/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix memory leak in helper.c - -Thanks to Xu Mingjie for spotting this. - -author: Simon Kelley -commit-url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=69bc94779c2f035a9fffdb5327a54c3aeca73ed5 -diff --git a/src/helper.c b/src/helper.c -index 33ba120..c392eec 100644 (file) ---- a/src/helper.c -+++ b/src/helper.c -@@ -80,7 +80,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) -@@ -186,11 +187,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)) -- cgit v1.2.3-65-gdbad