Attachment 2339 Details for Bug 2139 – Reset startup_pipe after dup2'ing

[patch] Reset startup_pipe after dup2'ing

reexec.diff (text/plain), 997 bytes, created by Damien Miller on 2013-09-19 10:40:22 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2013-09-19 10:40:22 AEST

Size: 997 bytes

patch

obsolete

>Index: sshd.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/sshd.c,v
>retrieving revision 1.406
>diff -u -p -r1.406 sshd.c
>--- sshd.c	2 Sep 2013 22:00:34 -0000	1.406
>+++ sshd.c	19 Sep 2013 00:38:08 -0000
>@@ -1826,13 +1826,13 @@ main(int ac, char **av)
> 		dup2(STDIN_FILENO, STDOUT_FILENO);
> 		if (startup_pipe == -1)
> 			close(REEXEC_STARTUP_PIPE_FD);
>-		else
>+		else {
> 			dup2(startup_pipe, REEXEC_STARTUP_PIPE_FD);
>+			startup_pipe = REEXEC_STARTUP_PIPE_FD;
>+		}
> 
> 		dup2(config_s[1], REEXEC_CONFIG_PASS_FD);
> 		close(config_s[1]);
>-		if (startup_pipe != -1)
>-			close(startup_pipe);
> 
> 		execv(rexec_argv[0], rexec_argv);
> 
>@@ -1843,8 +1843,6 @@ main(int ac, char **av)
> 		    options.log_facility, log_stderr);
> 
> 		/* Clean up fds */
>-		startup_pipe = REEXEC_STARTUP_PIPE_FD;
>-		close(config_s[1]);
> 		close(REEXEC_CONFIG_PASS_FD);
> 		newsock = sock_out = sock_in = dup(STDIN_FILENO);
> 		if ((fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) {

Actions: View | Diff

Attachments on bug 2139: 2339 | 2347