From 61ee4d68ca0fcc793a826fc7ec70f3b8ffd12ab6 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 15 Oct 2013 11:56:47 +1100 Subject: - djm@cvs.openbsd.org 2013/10/10 01:43:03 [sshd.c] bz#2139: fix re-exec fallback by ensuring that startup_pipe is correctly updated; ok dtucker@ --- ChangeLog | 4 ++++ sshd.c | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b67c1bc2d..ee3ede1b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,10 @@ - djm@cvs.openbsd.org 2013/10/10 00:53:25 [sftp-server.c] add -Q, -P and -p to usage() before jmc@ catches me + - djm@cvs.openbsd.org 2013/10/10 01:43:03 + [sshd.c] + bz#2139: fix re-exec fallback by ensuring that startup_pipe is correctly + updated; ok dtucker@ 20131010 - (dtucker) OpenBSD CVS Sync diff --git a/sshd.c b/sshd.c index 7e3b60f9f..287706d47 100644 --- a/sshd.c +++ b/sshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.406 2013/09/02 22:00:34 deraadt Exp $ */ +/* $OpenBSD: sshd.c,v 1.407 2013/10/10 01:43:03 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1940,13 +1940,14 @@ main(int ac, char **av) dup2(STDIN_FILENO, STDOUT_FILENO); if (startup_pipe == -1) close(REEXEC_STARTUP_PIPE_FD); - else + else if (startup_pipe != REEXEC_STARTUP_PIPE_FD) { dup2(startup_pipe, REEXEC_STARTUP_PIPE_FD); + close(startup_pipe); + 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); @@ -1957,8 +1958,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) { -- cgit v1.2.3