tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2009/01/22 09:46:01 

[channels.c channels.h session.c]
     make Channel->path an allocated string, saving a few bytes here and
     there and fixing bz#1380 in the process; ok markus@
This commit is contained in:
Damien Miller 2009-01-28 16:29:49 +11:00
parent 5bc6aae3db
commit a1c1b6c86d
4 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -53,6 +53,10 @@
so move the comment. so move the comment.
3) reorder so like options are together 3) reorder so like options are together
ok djm@ ok djm@
- djm@cvs.openbsd.org 2009/01/22 09:46:01
[channels.c channels.h session.c]
make Channel->path an allocated string, saving a few bytes here and
there and fixing bz#1380 in the process; ok markus@
20090107 20090107
- (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
@ -5062,5 +5066,5 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5172 2009/01/28 05:27:31 djm Exp $ $Id: ChangeLog,v 1.5173 2009/01/28 05:29:49 djm Exp $

48
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.292 2009/01/14 01:38:06 djm Exp $ */ /* $OpenBSD: channels.c,v 1.293 2009/01/22 09:46:01 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -296,6 +296,7 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd,
buffer_init(&c->input); buffer_init(&c->input);
buffer_init(&c->output); buffer_init(&c->output);
buffer_init(&c->extended); buffer_init(&c->extended);
c->path = NULL;
c->ostate = CHAN_OUTPUT_OPEN; c->ostate = CHAN_OUTPUT_OPEN;
c->istate = CHAN_INPUT_OPEN; c->istate = CHAN_INPUT_OPEN;
c->flags = 0; c->flags = 0;
@ -402,6 +403,10 @@ channel_free(Channel *c)
xfree(c->remote_name); xfree(c->remote_name);
c->remote_name = NULL; c->remote_name = NULL;
} }
if (c->path) {
xfree(c->path);
c->path = NULL;
}
while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) { while ((cc = TAILQ_FIRST(&c->status_confirms)) != NULL) {
if (cc->abandon_cb != NULL) if (cc->abandon_cb != NULL)
cc->abandon_cb(c, cc->ctx); cc->abandon_cb(c, cc->ctx);
@ -1035,9 +1040,13 @@ channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset)
strlcpy(username, p, sizeof(username)); strlcpy(username, p, sizeof(username));
buffer_consume(&c->input, len); buffer_consume(&c->input, len);
if (c->path != NULL) {
xfree(c->path);
c->path = NULL;
}
if (need == 1) { /* SOCKS4: one string */ if (need == 1) { /* SOCKS4: one string */
host = inet_ntoa(s4_req.dest_addr); host = inet_ntoa(s4_req.dest_addr);
strlcpy(c->path, host, sizeof(c->path)); c->path = xstrdup(host);
} else { /* SOCKS4A: two strings */ } else { /* SOCKS4A: two strings */
have = buffer_len(&c->input); have = buffer_len(&c->input);
p = buffer_ptr(&c->input); p = buffer_ptr(&c->input);
@ -1048,11 +1057,12 @@ channel_decode_socks4(Channel *c, fd_set *readset, fd_set *writeset)
if (len > have) if (len > have)
fatal("channel %d: decode socks4a: len %d > have %d", fatal("channel %d: decode socks4a: len %d > have %d",
c->self, len, have); c->self, len, have);
if (strlcpy(c->path, p, sizeof(c->path)) >= sizeof(c->path)) { if (len > NI_MAXHOST) {
error("channel %d: hostname \"%.100s\" too long", error("channel %d: hostname \"%.100s\" too long",
c->self, p); c->self, p);
return -1; return -1;
} }
c->path = xstrdup(p);
buffer_consume(&c->input, len); buffer_consume(&c->input, len);
} }
c->host_port = ntohs(s4_req.dest_port); c->host_port = ntohs(s4_req.dest_port);
@ -1093,7 +1103,7 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)
u_int8_t atyp; u_int8_t atyp;
} s5_req, s5_rsp; } s5_req, s5_rsp;
u_int16_t dest_port; u_int16_t dest_port;
u_char *p, dest_addr[255+1]; u_char *p, dest_addr[255+1], ntop[INET6_ADDRSTRLEN];
u_int have, need, i, found, nmethods, addrlen, af; u_int have, need, i, found, nmethods, addrlen, af;
debug2("channel %d: decode socks5", c->self); debug2("channel %d: decode socks5", c->self);
@ -1166,10 +1176,22 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)
buffer_get(&c->input, (char *)&dest_addr, addrlen); buffer_get(&c->input, (char *)&dest_addr, addrlen);
buffer_get(&c->input, (char *)&dest_port, 2); buffer_get(&c->input, (char *)&dest_port, 2);
dest_addr[addrlen] = '\0'; dest_addr[addrlen] = '\0';
if (s5_req.atyp == SSH_SOCKS5_DOMAIN) if (c->path != NULL) {
strlcpy(c->path, (char *)dest_addr, sizeof(c->path)); xfree(c->path);
else if (inet_ntop(af, dest_addr, c->path, sizeof(c->path)) == NULL) c->path = NULL;
return -1; }
if (s5_req.atyp == SSH_SOCKS5_DOMAIN) {
if (addrlen > NI_MAXHOST - 1) {
error("channel %d: dynamic request: socks5 hostname "
"\"%.100s\" too long", c->self, dest_addr);
return -1;
}
c->path = xstrdup(dest_addr);
} else {
if (inet_ntop(af, dest_addr, ntop, sizeof(ntop)) == NULL)
return -1;
c->path = xstrdup(ntop);
}
c->host_port = ntohs(dest_port); c->host_port = ntohs(dest_port);
debug2("channel %d: dynamic request: socks5 host %s port %u command %u", debug2("channel %d: dynamic request: socks5 host %s port %u command %u",
@ -1398,7 +1420,8 @@ channel_post_port_listener(Channel *c, fd_set *readset, fd_set *writeset)
c->local_window_max, c->local_maxpacket, 0, rtype, 1); c->local_window_max, c->local_maxpacket, 0, rtype, 1);
nc->listening_port = c->listening_port; nc->listening_port = c->listening_port;
nc->host_port = c->host_port; nc->host_port = c->host_port;
strlcpy(nc->path, c->path, sizeof(nc->path)); if (c->path != NULL)
nc->path = xstrdup(c->path);
if (nextstate == SSH_CHANNEL_DYNAMIC) { if (nextstate == SSH_CHANNEL_DYNAMIC) {
/* /*
@ -2454,7 +2477,7 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
error("No forward host name."); error("No forward host name.");
return 0; return 0;
} }
if (strlen(host) > SSH_CHANNEL_PATH_LEN - 1) { if (strlen(host) > NI_MAXHOST) {
error("Forward host name too long."); error("Forward host name too long.");
return 0; return 0;
} }
@ -2555,7 +2578,7 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
c = channel_new("port listener", type, sock, sock, -1, c = channel_new("port listener", type, sock, sock, -1,
CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT,
0, "port listener", 1); 0, "port listener", 1);
strlcpy(c->path, host, sizeof(c->path)); c->path = xstrdup(host);
c->host_port = port_to_connect; c->host_port = port_to_connect;
c->listening_port = listen_port; c->listening_port = listen_port;
success = 1; success = 1;
@ -2577,8 +2600,7 @@ channel_cancel_rport_listener(const char *host, u_short port)
Channel *c = channels[i]; Channel *c = channels[i];
if (c != NULL && c->type == SSH_CHANNEL_RPORT_LISTENER && if (c != NULL && c->type == SSH_CHANNEL_RPORT_LISTENER &&
strncmp(c->path, host, sizeof(c->path)) == 0 && strcmp(c->path, host) == 0 && c->listening_port == port) {
c->listening_port == port) {
debug2("%s: close channel %d", __func__, i); debug2("%s: close channel %d", __func__, i);
channel_free(c); channel_free(c);
found = 1; found = 1;

6
channels.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.h,v 1.96 2008/06/15 20:06:26 djm Exp $ */ /* $OpenBSD: channels.h,v 1.97 2009/01/22 09:46:01 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -55,8 +55,6 @@
#define SSH_CHANNEL_ZOMBIE 14 /* Almost dead. */ #define SSH_CHANNEL_ZOMBIE 14 /* Almost dead. */
#define SSH_CHANNEL_MAX_TYPE 15 #define SSH_CHANNEL_MAX_TYPE 15
#define SSH_CHANNEL_PATH_LEN 256
struct Channel; struct Channel;
typedef struct Channel Channel; typedef struct Channel Channel;
@ -105,7 +103,7 @@ struct Channel {
Buffer output; /* data received over encrypted connection for Buffer output; /* data received over encrypted connection for
* send on socket */ * send on socket */
Buffer extended; Buffer extended;
char path[SSH_CHANNEL_PATH_LEN]; char *path;
/* path for unix domain sockets, or host name for forwards */ /* path for unix domain sockets, or host name for forwards */
int listening_port; /* port being listened for forwards */ int listening_port; /* port being listened for forwards */
int host_port; /* remote port to connect for forwards */ int host_port; /* remote port to connect for forwards */

4
session.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.244 2008/11/09 12:34:47 tobias Exp $ */ /* $OpenBSD: session.c,v 1.245 2009/01/22 09:46:01 djm Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -234,7 +234,7 @@ auth_input_request_forwarding(struct passwd * pw)
SSH_CHANNEL_AUTH_SOCKET, sock, sock, -1, SSH_CHANNEL_AUTH_SOCKET, sock, sock, -1,
CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT,
0, "auth socket", 1); 0, "auth socket", 1);
strlcpy(nc->path, auth_sock_name, sizeof(nc->path)); nc->path = xstrdup(auth_sock_name);
return 1; return 1;
authsock_err: authsock_err: