1 files changed, 56 insertions, 58 deletions

diff --git a/session.c b/session.c
index 19eaa20c3..d4b57bdfb 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.261 2012/12/02 20:46:11 djm Exp $ */
+/* $OpenBSD: session.c,v 1.266 2013/07/19 07:37:48 markus Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -80,6 +80,7 @@
 #include "hostfile.h"
 #include "auth.h"
 #include "auth-options.h"
+#include "authfd.h"
 #include "pathnames.h"
 #include "log.h"
 #include "servconf.h"
@@ -199,7 +200,7 @@ auth_input_request_forwarding(struct passwd * pw)
                 packet_send_debug("Agent forwarding disabled: "
                     "mkdtemp() failed: %.100s", strerror(errno));
                 restore_uid();
-                xfree(auth_sock_dir);
+                free(auth_sock_dir);
                 auth_sock_dir = NULL;
                 goto authsock_err;
         }
@@ -244,11 +245,10 @@ auth_input_request_forwarding(struct passwd * pw)
         return 1;
 
  authsock_err:
-        if (auth_sock_name != NULL)
-                xfree(auth_sock_name);
+        free(auth_sock_name);
         if (auth_sock_dir != NULL) {
                 rmdir(auth_sock_dir);
-                xfree(auth_sock_dir);
+                free(auth_sock_dir);
         }
         if (sock != -1)
                 close(sock);
@@ -364,8 +364,8 @@ do_authenticated1(Authctxt *authctxt)
                         packet_check_eom();
                         success = session_setup_x11fwd(s);
                         if (!success) {
-                                xfree(s->auth_proto);
-                                xfree(s->auth_data);
+                                free(s->auth_proto);
+                                free(s->auth_data);
                                 s->auth_proto = NULL;
                                 s->auth_data = NULL;
                         }
@@ -412,7 +412,7 @@ do_authenticated1(Authctxt *authctxt)
                                 if (do_exec(s, command) != 0)
                                         packet_disconnect(
                                             "command execution failed");
-                                xfree(command);
+                                free(command);
                         } else {
                                 if (do_exec(s, NULL) != 0)
                                         packet_disconnect(
@@ -977,7 +977,7 @@ child_set_env(char ***envp, u_int *envsizep, const char *name,
                         break;
         if (env[i]) {
                 /* Reuse the slot. */
-                xfree(env[i]);
+                free(env[i]);
         } else {
                 /* New variable.  Expand if necessary. */
                 envsize = *envsizep;
@@ -1093,8 +1093,8 @@ read_etc_default_login(char ***env, u_int *envsize, uid_t uid)
                         umask((mode_t)mask);
 
         for (i = 0; tmpenv[i] != NULL; i++)
-                xfree(tmpenv[i]);
-        xfree(tmpenv);
+                free(tmpenv[i]);
+        free(tmpenv);
 }
 #endif /* HAVE_ETC_DEFAULT_LOGIN */
 
@@ -1110,7 +1110,7 @@ copy_environment(char **source, char ***env, u_int *envsize)
         for(i = 0; source[i] != NULL; i++) {
                 var_name = xstrdup(source[i]);
                 if ((var_val = strstr(var_name, "=")) == NULL) {
-                        xfree(var_name);
+                        free(var_name);
                         continue;
                 }
                 *var_val++ = '\0';
@@ -1118,7 +1118,7 @@ copy_environment(char **source, char ***env, u_int *envsize)
                 debug3("Copy environment: %s=%s", var_name, var_val);
                 child_set_env(env, envsize, var_name, var_val);
 
-                xfree(var_name);
+                free(var_name);
         }
 }
 
@@ -1219,8 +1219,8 @@ do_setup_env(Session *s, const char *shell)
                                 child_set_env(&env, &envsize, str, str + i + 1);
                         }
                         custom_environment = ce->next;
-                        xfree(ce->s);
-                        xfree(ce);
+                        free(ce->s);
+                        free(ce);
                 }
         }
 
@@ -1232,7 +1232,7 @@ do_setup_env(Session *s, const char *shell)
         laddr = get_local_ipaddr(packet_get_connection_in());
         snprintf(buf, sizeof buf, "%.50s %d %.50s %d",
             get_remote_ipaddr(), get_remote_port(), laddr, get_local_port());
-        xfree(laddr);
+        free(laddr);
         child_set_env(&env, &envsize, "SSH_CONNECTION", buf);
 
         if (s->ttyfd != -1)
@@ -1403,7 +1403,7 @@ do_nologin(struct passwd *pw)
 #endif
         if (stat(nl, &sb) == -1) {
                 if (nl != def_nl)
-                        xfree(nl);
+                        free(nl);
                 return;
         }
 
@@ -1513,6 +1513,9 @@ do_setusercontext(struct passwd *pw)
                         safely_chroot(chroot_path, pw->pw_uid);
                         free(tmp);
                         free(chroot_path);
+                        /* Make sure we don't attempt to chroot again */
+                        free(options.chroot_directory);
+                        options.chroot_directory = NULL;
                 }
 
 #ifdef HAVE_LOGIN_CAP
@@ -1529,6 +1532,9 @@ do_setusercontext(struct passwd *pw)
                 /* Permanently switch to the desired uid. */
                 permanently_set_uid(pw);
 #endif
+        } else if (options.chroot_directory != NULL &&
+            strcasecmp(options.chroot_directory, "none") != 0) {
+                fatal("server lacks privileges to chroot to ChrootDirectory");
         }
 
         if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid)
@@ -1584,6 +1590,13 @@ launch_login(struct passwd *pw, const char *hostname)
 static void
 child_close_fds(void)
 {
+        extern AuthenticationConnection *auth_conn;
+
+        if (auth_conn) {
+                ssh_close_authentication_connection(auth_conn);
+                auth_conn = NULL;
+        }
+
         if (packet_get_connection_in() == packet_get_connection_out())
                 close(packet_get_connection_in());
         else {
@@ -2048,7 +2061,7 @@ session_pty_req(Session *s)
         s->ypixel = packet_get_int();
 
         if (strcmp(s->term, "") == 0) {
-                xfree(s->term);
+                free(s->term);
                 s->term = NULL;
         }
 
@@ -2056,8 +2069,7 @@ session_pty_req(Session *s)
         debug("Allocating pty.");
         if (!PRIVSEP(pty_allocate(&s->ptyfd, &s->ttyfd, s->tty,
             sizeof(s->tty)))) {
-                if (s->term)
-                        xfree(s->term);
+                free(s->term);
                 s->term = NULL;
                 s->ptyfd = -1;
                 s->ttyfd = -1;
@@ -2118,7 +2130,7 @@ session_subsystem_req(Session *s)
                 logit("subsystem request for %.100s failed, subsystem not found",
                     subsys);
 
-        xfree(subsys);
+        free(subsys);
         return success;
 }
 
@@ -2140,8 +2152,8 @@ session_x11_req(Session *s)
 
         success = session_setup_x11fwd(s);
         if (!success) {
-                xfree(s->auth_proto);
-                xfree(s->auth_data);
+                free(s->auth_proto);
+                free(s->auth_data);
                 s->auth_proto = NULL;
                 s->auth_data = NULL;
         }
@@ -2163,7 +2175,7 @@ session_exec_req(Session *s)
         char *command = packet_get_string(&len);
         packet_check_eom();
         success = do_exec(s, command) == 0;
-        xfree(command);
+        free(command);
         return success;
 }
 
@@ -2209,8 +2221,8 @@ session_env_req(Session *s)
         debug2("Ignoring env request %s: disallowed name", name);
 
  fail:
-        xfree(name);
-        xfree(val);
+        free(name);
+        free(val);
         return (0);
 }
 
@@ -2392,24 +2404,16 @@ session_close_single_x11(int id, void *arg)
                 if (s->x11_chanids[i] != id)
                         session_close_x11(s->x11_chanids[i]);
         }
-        xfree(s->x11_chanids);
+        free(s->x11_chanids);
         s->x11_chanids = NULL;
-        if (s->display) {
-                xfree(s->display);
-                s->display = NULL;
-        }
-        if (s->auth_proto) {
-                xfree(s->auth_proto);
-                s->auth_proto = NULL;
-        }
-        if (s->auth_data) {
-                xfree(s->auth_data);
-                s->auth_data = NULL;
-        }
-        if (s->auth_display) {
-                xfree(s->auth_display);
-                s->auth_display = NULL;
-        }
+        free(s->display);
+        s->display = NULL;
+        free(s->auth_proto);
+        s->auth_proto = NULL;
+        free(s->auth_data);
+        s->auth_data = NULL;
+        free(s->auth_display);
+        s->auth_display = NULL;
 }
 
 static void
@@ -2471,24 +2475,18 @@ session_close(Session *s)
         debug("session_close: session %d pid %ld", s->self, (long)s->pid);
         if (s->ttyfd != -1)
                 session_pty_cleanup(s);
-        if (s->term)
-                xfree(s->term);
-        if (s->display)
-                xfree(s->display);
-        if (s->x11_chanids)
-                xfree(s->x11_chanids);
-        if (s->auth_display)
-                xfree(s->auth_display);
-        if (s->auth_data)
-                xfree(s->auth_data);
-        if (s->auth_proto)
-                xfree(s->auth_proto);
+        free(s->term);
+        free(s->display);
+        free(s->x11_chanids);
+        free(s->auth_display);
+        free(s->auth_data);
+        free(s->auth_proto);
         if (s->env != NULL) {
                 for (i = 0; i < s->num_env; i++) {
-                        xfree(s->env[i].name);
-                        xfree(s->env[i].val);
+                        free(s->env[i].name);
+                        free(s->env[i].val);
                 }
-                xfree(s->env);
+                free(s->env);
         }
         session_proctitle(s);
         session_unused(s->self);