Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle failure of pipe() call in swap_to_tcp()

Browse Source
This commit is contained in:
Simon Kelley
2025-01-06 23:16:40 +00:00
parent e24c341068
commit c52653f97c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dnsmasq.c
View File

@@ -2091,11 +2091,11 @@ int swap_to_tcp(struct frec *forward, time_t now, int status, struct dns_header
if (daemon->tcp_pids[i] == 0 && daemon->tcp_pipes[i] == -1) if (daemon->tcp_pids[i] == 0 && daemon->tcp_pipes[i] == -1)
break; break;
/* No slots */ /* No slots or no pipe */
if (i < 0) if (i < 0 || pipe(pipefd) != 0)
return STAT_ABANDONED; return STAT_ABANDONED;`
if (pipe(pipefd) == 0 && (p = fork()) != 0) if ((p = fork()) != 0)
{ {
close(pipefd[1]); /* parent needs read pipe end. */ close(pipefd[1]); /* parent needs read pipe end. */
if (p == -1) if (p == -1)

4
src/util.c
View File

@@ -767,8 +767,8 @@ int retry_send(ssize_t rc)
/* rw = 0 -> write /* rw = 0 -> write
rw = 1 -> read rw = 1 -> read
rw = 2 -> read once rw = 2 -> write once
rw = 3 -> write once rw = 3 -> read once
"once" fail if all the data doesn't arrive/go in a single read/write. "once" fail if all the data doesn't arrive/go in a single read/write.
This indicates a timeout of a TCP socket. This indicates a timeout of a TCP socket.