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

- markus@cvs.openbsd.org 2002/02/06 14:55:16 

[channels.c clientloop.c serverloop.c ssh.c]
     channel_new never returns NULL, mouring@; ok djm@
This commit is contained in:
Damien Miller 2002-02-08 22:07:16 +11:00
parent f3dcf1fc88
commit 699d003e3a
5 changed files with 14 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -22,6 +22,9 @@
- markus@cvs.openbsd.org 2002/02/06 14:37:22 - markus@cvs.openbsd.org 2002/02/06 14:37:22
[session.c] [session.c]
minor KNF minor KNF
- markus@cvs.openbsd.org 2002/02/06 14:55:16
[channels.c clientloop.c serverloop.c ssh.c]
channel_new never returns NULL, mouring@; ok djm@
20020205 20020205
- (djm) Cleanup after sync: - (djm) Cleanup after sync:
@ -7528,4 +7531,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1834 2002/02/08 11:06:48 djm Exp $ $Id: ChangeLog,v 1.1835 2002/02/08 11:07:16 djm Exp $

58
channels.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.166 2002/02/05 14:32:55 markus Exp $"); RCSID("$OpenBSD: channels.c,v 1.167 2002/02/06 14:55:15 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -1004,11 +1004,6 @@ channel_post_x11_listener(Channel *c, fd_set * readset, fd_set * writeset)
SSH_CHANNEL_OPENING, newsock, newsock, -1, SSH_CHANNEL_OPENING, newsock, newsock, -1,
c->local_window_max, c->local_maxpacket, c->local_window_max, c->local_maxpacket,
0, xstrdup(buf), 1); 0, xstrdup(buf), 1);
if (nc == NULL) {
close(newsock);
xfree(remote_ipaddr);
return;
}
if (compat20) { if (compat20) {
packet_start(SSH2_MSG_CHANNEL_OPEN); packet_start(SSH2_MSG_CHANNEL_OPEN);
packet_put_cstring("x11"); packet_put_cstring("x11");
@ -1126,11 +1121,6 @@ channel_post_port_listener(Channel *c, fd_set * readset, fd_set * writeset)
nextstate, newsock, newsock, -1, nextstate, newsock, newsock, -1,
c->local_window_max, c->local_maxpacket, c->local_window_max, c->local_maxpacket,
0, xstrdup(rtype), 1); 0, xstrdup(rtype), 1);
if (nc == NULL) {
error("channel_post_port_listener: no new channel:");
close(newsock);
return;
}
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)); strlcpy(nc->path, c->path, sizeof(nc->path));
@ -1173,11 +1163,6 @@ channel_post_auth_listener(Channel *c, fd_set * readset, fd_set * writeset)
SSH_CHANNEL_OPENING, newsock, newsock, -1, SSH_CHANNEL_OPENING, newsock, newsock, -1,
c->local_window_max, c->local_maxpacket, c->local_window_max, c->local_maxpacket,
0, name, 1); 0, name, 1);
if (nc == NULL) {
error("channel_post_auth_listener: channel_new failed");
xfree(name);
close(newsock);
}
if (compat20) { if (compat20) {
packet_start(SSH2_MSG_CHANNEL_OPEN); packet_start(SSH2_MSG_CHANNEL_OPEN);
packet_put_cstring("auth-agent@openssh.com"); packet_put_cstring("auth-agent@openssh.com");
@ -1977,12 +1962,7 @@ channel_input_port_open(int type, u_int32_t seq, void *ctxt)
c = channel_new("connected socket", c = channel_new("connected socket",
SSH_CHANNEL_CONNECTING, sock, sock, -1, 0, 0, 0, SSH_CHANNEL_CONNECTING, sock, sock, -1, 0, 0, 0,
originator_string, 1); originator_string, 1);
if (c == NULL) { c->remote_id = remote_id;
error("channel_input_port_open: channel_new failed");
close(sock);
} else {
c->remote_id = remote_id;
}
} }
if (c == NULL) { if (c == NULL) {
packet_start(SSH_MSG_CHANNEL_OPEN_FAILURE); packet_start(SSH_MSG_CHANNEL_OPEN_FAILURE);
@ -2083,11 +2063,6 @@ 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, xstrdup("port listener"), 1); 0, xstrdup("port listener"), 1);
if (c == NULL) {
error("channel_setup_fwd_listener: channel_new failed");
close(sock);
continue;
}
strlcpy(c->path, host, sizeof(c->path)); strlcpy(c->path, host, sizeof(c->path));
c->host_port = port_to_connect; c->host_port = port_to_connect;
c->listening_port = listen_port; c->listening_port = listen_port;
@ -2427,8 +2402,7 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
SSH_CHANNEL_X11_LISTENER, sock, sock, -1, SSH_CHANNEL_X11_LISTENER, sock, sock, -1,
CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT,
0, xstrdup("X11 inet listener"), 1); 0, xstrdup("X11 inet listener"), 1);
if (nc != NULL) nc->single_connection = single_connection;
nc->single_connection = single_connection;
} }
/* Return the display number for the DISPLAY environment variable. */ /* Return the display number for the DISPLAY environment variable. */
@ -2580,13 +2554,8 @@ x11_input_open(int type, u_int32_t seq, void *ctxt)
c = channel_new("connected x11 socket", c = channel_new("connected x11 socket",
SSH_CHANNEL_X11_OPEN, sock, sock, -1, 0, 0, 0, SSH_CHANNEL_X11_OPEN, sock, sock, -1, 0, 0, 0,
remote_host, 1); remote_host, 1);
if (c == NULL) { c->remote_id = remote_id;
error("x11_input_open: channel_new failed"); c->force_drain = 1;
close(sock);
} else {
c->remote_id = remote_id;
c->force_drain = 1;
}
} }
if (c == NULL) { if (c == NULL) {
/* Send refusal to the remote host. */ /* Send refusal to the remote host. */
@ -2800,13 +2769,6 @@ 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, xstrdup("auth socket"), 1); 0, xstrdup("auth socket"), 1);
if (nc == NULL) {
error("auth_input_request_forwarding: channel_new failed");
auth_sock_cleanup_proc(pw);
fatal_remove_cleanup(auth_sock_cleanup_proc, pw);
close(sock);
return 0;
}
strlcpy(nc->path, auth_sock_name, sizeof(nc->path)); strlcpy(nc->path, auth_sock_name, sizeof(nc->path));
return 1; return 1;
} }
@ -2840,14 +2802,8 @@ auth_input_open_request(int type, u_int32_t seq, void *ctxt)
name = xstrdup("authentication agent connection"); name = xstrdup("authentication agent connection");
c = channel_new("", SSH_CHANNEL_OPEN, sock, sock, c = channel_new("", SSH_CHANNEL_OPEN, sock, sock,
-1, 0, 0, 0, name, 1); -1, 0, 0, 0, name, 1);
if (c == NULL) { c->remote_id = remote_id;
error("auth_input_open_request: channel_new failed"); c->force_drain = 1;
xfree(name);
close(sock);
} else {
c->remote_id = remote_id;
c->force_drain = 1;
}
} }
if (c == NULL) { if (c == NULL) {
packet_start(SSH_MSG_CHANNEL_OPEN_FAILURE); packet_start(SSH_MSG_CHANNEL_OPEN_FAILURE);

14
clientloop.c
View File

@ -59,7 +59,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: clientloop.c,v 1.95 2002/01/10 11:24:04 markus Exp $"); RCSID("$OpenBSD: clientloop.c,v 1.96 2002/02/06 14:55:15 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -1072,10 +1072,6 @@ client_request_forwarded_tcpip(const char *request_type, int rchan)
SSH_CHANNEL_CONNECTING, sock, sock, -1, SSH_CHANNEL_CONNECTING, sock, sock, -1,
CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
xstrdup(originator_address), 1); xstrdup(originator_address), 1);
if (c == NULL) {
error("client_request_forwarded_tcpip: channel_new failed");
close(sock);
}
xfree(originator_address); xfree(originator_address);
xfree(listen_address); xfree(listen_address);
return c; return c;
@ -1113,10 +1109,6 @@ client_request_x11(const char *request_type, int rchan)
SSH_CHANNEL_X11_OPEN, sock, sock, -1, SSH_CHANNEL_X11_OPEN, sock, sock, -1,
CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0,
xstrdup("x11"), 1); xstrdup("x11"), 1);
if (c == NULL) {
error("client_request_x11: channel_new failed");
close(sock);
}
c->force_drain = 1; c->force_drain = 1;
return c; return c;
} }
@ -1139,10 +1131,6 @@ client_request_agent(const char *request_type, int rchan)
SSH_CHANNEL_OPEN, sock, sock, -1, SSH_CHANNEL_OPEN, sock, sock, -1,
CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
xstrdup("authentication agent connection"), 1); xstrdup("authentication agent connection"), 1);
if (c == NULL) {
error("client_request_agent: channel_new failed");
close(sock);
}
c->force_drain = 1; c->force_drain = 1;
return c; return c;
} }

10
serverloop.c
View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: serverloop.c,v 1.97 2002/02/03 17:53:25 markus Exp $"); RCSID("$OpenBSD: serverloop.c,v 1.98 2002/02/06 14:55:16 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "packet.h" #include "packet.h"
@ -870,10 +870,6 @@ server_request_direct_tcpip(char *ctype)
c = channel_new(ctype, SSH_CHANNEL_CONNECTING, c = channel_new(ctype, SSH_CHANNEL_CONNECTING,
sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT, sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT,
CHAN_TCP_PACKET_DEFAULT, 0, xstrdup("direct-tcpip"), 1); CHAN_TCP_PACKET_DEFAULT, 0, xstrdup("direct-tcpip"), 1);
if (c == NULL) {
error("server_request_direct_tcpip: channel_new failed");
close(sock);
}
return c; return c;
} }
@ -893,10 +889,6 @@ server_request_session(char *ctype)
c = channel_new(ctype, SSH_CHANNEL_LARVAL, c = channel_new(ctype, SSH_CHANNEL_LARVAL,
-1, -1, -1, /*window size*/0, CHAN_SES_PACKET_DEFAULT, -1, -1, -1, /*window size*/0, CHAN_SES_PACKET_DEFAULT,
0, xstrdup("server-session"), 1); 0, xstrdup("server-session"), 1);
if (c == NULL) {
error("server_request_session: channel_new failed");
return NULL;
}
if (session_open(xxx_authctxt, c->self) != 1) { if (session_open(xxx_authctxt, c->self) != 1) {
debug("session open failed, free channel %d", c->self); debug("session open failed, free channel %d", c->self);
channel_free(c); channel_free(c);

4
ssh.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.161 2002/02/05 14:32:55 markus Exp $"); RCSID("$OpenBSD: ssh.c,v 1.162 2002/02/06 14:55:16 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -1155,8 +1155,6 @@ ssh_session2_open(void)
"session", SSH_CHANNEL_OPENING, in, out, err, "session", SSH_CHANNEL_OPENING, in, out, err,
window, packetmax, CHAN_EXTENDED_WRITE, window, packetmax, CHAN_EXTENDED_WRITE,
xstrdup("client-session"), /*nonblock*/0); xstrdup("client-session"), /*nonblock*/0);
if (c == NULL)
fatal("ssh_session2_open: channel_new failed");
debug3("ssh_session2_open: channel_new: %d", c->self); debug3("ssh_session2_open: channel_new: %d", c->self);