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

upstream: Store timeouts as int, not u_int as they are limited to 

INT_MAX. Fixes sign compare warnings systems with 32-bit time_t due to type
promotion.  OK djm@

OpenBSD-Commit-ID: 48081e9ad35705c5f1705711704a4c2ff94e87b7
This commit is contained in:
millert@openbsd.org 2023-06-05 13:24:36 +00:00 committed by Damien Miller
parent 2709809fd6
commit b53a809a54
No known key found for this signature in database
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.430 2023/03/10 03:01:51 dtucker Exp $ */ /* $OpenBSD: channels.c,v 1.431 2023/06/05 13:24:36 millert 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
@ -154,7 +154,7 @@ struct permission_set {
/* Used to record timeouts per channel type */ /* Used to record timeouts per channel type */
struct ssh_channel_timeout { struct ssh_channel_timeout {
char *type_pattern; char *type_pattern;
u_int timeout_secs; int timeout_secs;
}; };
/* Master structure for channels state */ /* Master structure for channels state */
@ -312,11 +312,11 @@ channel_lookup(struct ssh *ssh, int id)
*/ */
void void
channel_add_timeout(struct ssh *ssh, const char *type_pattern, channel_add_timeout(struct ssh *ssh, const char *type_pattern,
u_int timeout_secs) int timeout_secs)
{ {
struct ssh_channels *sc = ssh->chanctxt; struct ssh_channels *sc = ssh->chanctxt;
debug2_f("channel type \"%s\" timeout %u seconds", debug2_f("channel type \"%s\" timeout %d seconds",
type_pattern, timeout_secs); type_pattern, timeout_secs);
sc->timeouts = xrecallocarray(sc->timeouts, sc->ntimeouts, sc->timeouts = xrecallocarray(sc->timeouts, sc->ntimeouts,
sc->ntimeouts + 1, sizeof(*sc->timeouts)); sc->ntimeouts + 1, sizeof(*sc->timeouts));
@ -340,7 +340,7 @@ channel_clear_timeouts(struct ssh *ssh)
sc->ntimeouts = 0; sc->ntimeouts = 0;
} }
static u_int static int
lookup_timeout(struct ssh *ssh, const char *type) lookup_timeout(struct ssh *ssh, const char *type)
{ {
struct ssh_channels *sc = ssh->chanctxt; struct ssh_channels *sc = ssh->chanctxt;

6
channels.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.h,v 1.149 2023/03/04 03:22:59 dtucker Exp $ */ /* $OpenBSD: channels.h,v 1.150 2023/06/05 13:24:36 millert Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -210,7 +210,7 @@ struct Channel {
/* Last traffic seen for OPEN channels */ /* Last traffic seen for OPEN channels */
time_t lastused; time_t lastused;
/* Inactivity timeout deadline in seconds (0 = no timeout) */ /* Inactivity timeout deadline in seconds (0 = no timeout) */
u_int inactive_deadline; int inactive_deadline;
}; };
#define CHAN_EXTENDED_IGNORE 0 #define CHAN_EXTENDED_IGNORE 0
@ -308,7 +308,7 @@ int channel_close_fd(struct ssh *, Channel *, int *);
void channel_send_window_changes(struct ssh *); void channel_send_window_changes(struct ssh *);
/* channel inactivity timeouts */ /* channel inactivity timeouts */
void channel_add_timeout(struct ssh *, const char *, u_int); void channel_add_timeout(struct ssh *, const char *, int);
void channel_clear_timeouts(struct ssh *); void channel_clear_timeouts(struct ssh *);
/* mux proxy support */ /* mux proxy support */

9
servconf.c
View File

@ -1,5 +1,5 @@
/* $OpenBSD: servconf.c,v 1.393 2023/05/24 23:01:06 djm Exp $ */ /* $OpenBSD: servconf.c,v 1.394 2023/06/05 13:24:36 millert 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
@ -959,7 +959,7 @@ process_permitopen(struct ssh *ssh, ServerOptions *options)
/* Parse a ChannelTimeout clause "pattern=interval" */ /* Parse a ChannelTimeout clause "pattern=interval" */
static int static int
parse_timeout(const char *s, char **typep, u_int *secsp) parse_timeout(const char *s, char **typep, int *secsp)
{ {
char *cp, *sdup; char *cp, *sdup;
int secs; int secs;
@ -985,7 +985,7 @@ parse_timeout(const char *s, char **typep, u_int *secsp)
if (typep != NULL) if (typep != NULL)
*typep = xstrdup(sdup); *typep = xstrdup(sdup);
if (secsp != NULL) if (secsp != NULL)
*secsp = (u_int)secs; *secsp = secs;
free(sdup); free(sdup);
return 0; return 0;
} }
@ -993,7 +993,8 @@ parse_timeout(const char *s, char **typep, u_int *secsp)
void void
process_channel_timeouts(struct ssh *ssh, ServerOptions *options) process_channel_timeouts(struct ssh *ssh, ServerOptions *options)
{ {
u_int i, secs; int secs;
u_int i;
char *type; char *type;
debug3_f("setting %u timeouts", options->num_channel_timeouts); debug3_f("setting %u timeouts", options->num_channel_timeouts);