upstream: Use time_t for x11 timeout.

Use time_t instead of u_int for remaining x11 timeout checks for 64bit
time_t safety.  From Coverity CIDs 405197 and 405028, ok djm@

OpenBSD-Commit-ID: 356685bfa1fc3d81bd95722d3fc47101cc1a4972

diff --git a/channels.c b/channels.c
index 0d26358cc65e4ac4d2bf55970f2deec5ed1a2f98..89a7fa3d3a5605593ee7c07921d57b449ef10e87 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.427 2023/01/18 02:00:10 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.428 2023/03/04 03:22:59 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -198,7 +198,7 @@ struct ssh_channels {
        u_int x11_saved_data_len;
 
        /* Deadline after which all X11 connections are refused */
-       u_int x11_refuse_time;
+       time_t x11_refuse_time;
 
        /*
         * Fake X11 authentication data.  This is what the server will be
@@ -1258,7 +1258,7 @@ x11_open_helper(struct ssh *ssh, struct sshbuf *b)
 
        /* Is this being called after the refusal deadline? */
        if (sc->x11_refuse_time != 0 &&
-           (u_int)monotime() >= sc->x11_refuse_time) {
+           monotime() >= sc->x11_refuse_time) {
                verbose("Rejected X11 connection after ForwardX11Timeout "
                    "expired");
                return -1;
@@ -1879,7 +1879,7 @@ port_open_helper(struct ssh *ssh, Channel *c, char *rtype)
 }
 
 void
-channel_set_x11_refuse_time(struct ssh *ssh, u_int refuse_time)
+channel_set_x11_refuse_time(struct ssh *ssh, time_t refuse_time)
 {
        ssh->chanctxt->x11_refuse_time = refuse_time;
 }

diff --git a/channels.h b/channels.h
index 101843a06d15998b06efbdf32f586ea967f43c86..91cc466cc8d47c8fad8fb50bbaec7bbf5c4c83cf 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.148 2023/01/18 02:00:10 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.149 2023/03/04 03:22:59 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -375,7 +375,7 @@ int  permitopen_port(const char *);
 
 /* x11 forwarding */
 
-void    channel_set_x11_refuse_time(struct ssh *, u_int);
+void    channel_set_x11_refuse_time(struct ssh *, time_t);
 int     x11_connect_display(struct ssh *);
 int     x11_create_display_inet(struct ssh *, int, int, int, u_int *, int **);
 void    x11_request_forwarding_with_spoofing(struct ssh *, int,