diff options
| author |   djm <djm@openbsd.org> | 2016-09-30 20:24:46 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2016-09-30 20:24:46 +0000 |
| commit | fc91d69784bb555cca7e86024446f339291bd169 (patch) | |
| tree | b87d35b49d1ee77a447ab154582cd4bcd712e69f | |
| parent | remove unneccessary .Pp; from jan stary (diff) | |
| download | wireguard-openbsd-fc91d69784bb555cca7e86024446f339291bd169.tar.xz wireguard-openbsd-fc91d69784bb555cca7e86024446f339291bd169.zip | |
fix some -Wpointer-sign warnings in the new mux proxy; ok markus@
| -rw-r--r-- | usr.bin/ssh/channels.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index 7373a496f1b..42b93677d7f 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.354 2016/09/30 09:19:13 markus Exp $ */ +/* $OpenBSD: channels.c,v 1.355 2016/09/30 20:24:46 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2445,7 +2445,8 @@ channel_proxy_downstream(Channel *downstream) char *ctype = NULL, *listen_host = NULL; u_char type; size_t have; - int ret = -1, r, id, remote_id, listen_port, idx; + int ret = -1, r, idx; + u_int id, remote_id, listen_port; /* sshbuf_dump(&downstream->input, stderr); */ if ((r = sshbuf_get_string_direct(&downstream->input, &cp, &have)) @@ -2536,6 +2537,11 @@ channel_proxy_downstream(Channel *downstream) error("%s: parse error %s", __func__, ssh_err(r)); goto out; } + if (listen_port > 65535) { + error("%s: tcpip-forward for %s: bad port %u", + __func__, listen_host, listen_port); + goto out; + } /* Record that connection to this host/port is permitted. */ permitted_opens = xreallocarray(permitted_opens, num_permitted_opens + 1, sizeof(*permitted_opens)); @@ -2543,7 +2549,7 @@ channel_proxy_downstream(Channel *downstream) permitted_opens[idx].host_to_connect = xstrdup("<mux>"); permitted_opens[idx].port_to_connect = -1; permitted_opens[idx].listen_host = listen_host; - permitted_opens[idx].listen_port = listen_port; + permitted_opens[idx].listen_port = (int)listen_port; permitted_opens[idx].downstream = downstream; listen_host = NULL; break; |