Mercurial > vanilla

annotate network/openssh/CVE-2019-6109.patch @ 997:b469e4f11ee1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
kde/kwayland: initial import, closes #1835
author David Demelier <markand@malikania.fr>
date Wed, 28 Aug 2019 20:33:00 +0200
parents f2c94d482098
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
121
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 From 11b88754cadcad0ba79b4ffcc127223248dccb54 Mon Sep 17 00:00:00 2001
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 From: "dtucker@openbsd.org" <dtucker@openbsd.org>
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 Date: Wed, 23 Jan 2019 08:01:46 +0000
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 Subject: upstream: Sanitize scp filenames via snmprintf. To do this we move
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
5
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 the progressmeter formatting outside of signal handler context and have the
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 atomicio callback called for EINTR too. bz#2434 with contributions from djm
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 and jjelen at redhat.com, ok djm@
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
9
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 OpenBSD-Commit-ID: 1af61c1f70e4f3bd8ab140b9f1fa699481db57d8
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
11
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 CVE-2019-6109
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
13
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 Origin: backport, https://anongit.mindrot.org/openssh.git/commit/?id=8976f1c4b2721c26e878151f52bdf346dfe2d54c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 Bug-Debian: https://bugs.debian.org/793412
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 Last-Update: 2019-02-08
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
17
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 Patch-Name: sanitize-scp-filenames-via-snmprintf.patch
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 ---
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 atomicio.c | 20 ++++++++++++++-----
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 progressmeter.c | 53 ++++++++++++++++++++++---------------------------
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 progressmeter.h | 3 ++-
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 scp.c | 1 +
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 sftp-client.c | 16 ++++++++-------
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 5 files changed, 51 insertions(+), 42 deletions(-)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
26
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 diff --git a/atomicio.c b/atomicio.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 index f854a06f5..d91bd7621 100644
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 --- a/atomicio.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 +++ b/atomicio.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 @@ -1,4 +1,4 @@
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 -/* $OpenBSD: atomicio.c,v 1.28 2016/07/27 23:18:12 djm Exp $ */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 +/* $OpenBSD: atomicio.c,v 1.29 2019/01/23 08:01:46 dtucker Exp $ */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
34 /*
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 * Copyright (c) 2006 Damien Miller. All rights reserved.
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 @@ -65,9 +65,14 @@ atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n,
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 res = (f) (fd, s + pos, n - pos);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
39 switch (res) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
40 case -1:
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
41 - if (errno == EINTR)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
42 + if (errno == EINTR) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
43 + /* possible SIGALARM, update callback */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 + if (cb != NULL && cb(cb_arg, 0) == -1) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 + errno = EINTR;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 + return pos;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
47 + }
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
48 continue;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
49 - if (errno == EAGAIN || errno == EWOULDBLOCK) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
50 + } else if (errno == EAGAIN || errno == EWOULDBLOCK) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
51 #ifndef BROKEN_READ_COMPARISON
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
52 (void)poll(&pfd, 1, -1);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
53 #endif
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
54 @@ -122,9 +127,14 @@ atomiciov6(ssize_t (*f) (int, const struct iovec *, int), int fd,
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
55 res = (f) (fd, iov, iovcnt);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
56 switch (res) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
57 case -1:
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
58 - if (errno == EINTR)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
59 + if (errno == EINTR) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
60 + /* possible SIGALARM, update callback */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
61 + if (cb != NULL && cb(cb_arg, 0) == -1) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
62 + errno = EINTR;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
63 + return pos;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
64 + }
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
65 continue;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
66 - if (errno == EAGAIN || errno == EWOULDBLOCK) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
67 + } else if (errno == EAGAIN || errno == EWOULDBLOCK) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
68 #ifndef BROKEN_READV_COMPARISON
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
69 (void)poll(&pfd, 1, -1);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
70 #endif
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
71 diff --git a/progressmeter.c b/progressmeter.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
72 index fe9bf52e4..add462dde 100644
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
73 --- a/progressmeter.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
74 +++ b/progressmeter.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
75 @@ -1,4 +1,4 @@
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
76 -/* $OpenBSD: progressmeter.c,v 1.45 2016/06/30 05:17:05 dtucker Exp $ */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
77 +/* $OpenBSD: progressmeter.c,v 1.46 2019/01/23 08:01:46 dtucker Exp $ */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
78 /*
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
79 * Copyright (c) 2003 Nils Nordman. All rights reserved.
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
80 *
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
81 @@ -31,6 +31,7 @@
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
82
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
83 #include <errno.h>
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
84 #include <signal.h>
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
85 +#include <stdarg.h>
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
86 #include <stdio.h>
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
87 #include <string.h>
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
88 #include <time.h>
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
89 @@ -39,6 +40,7 @@
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
90 #include "progressmeter.h"
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
91 #include "atomicio.h"
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
92 #include "misc.h"
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
93 +#include "utf8.h"
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
94
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
95 #define DEFAULT_WINSIZE 80
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
96 #define MAX_WINSIZE 512
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
97 @@ -61,7 +63,7 @@ static void setscreensize(void);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
98 void refresh_progress_meter(void);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
99
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
100 /* signal handler for updating the progress meter */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
101 -static void update_progress_meter(int);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
102 +static void sig_alarm(int);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
103
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
104 static double start; /* start progress */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
105 static double last_update; /* last progress update */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
106 @@ -74,6 +76,7 @@ static long stalled; /* how long we have been stalled */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
107 static int bytes_per_second; /* current speed in bytes per second */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
108 static int win_size; /* terminal window size */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
109 static volatile sig_atomic_t win_resized; /* for window resizing */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
110 +static volatile sig_atomic_t alarm_fired;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
111
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
112 /* units for format_size */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
113 static const char unit[] = " KMGT";
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
114 @@ -126,9 +129,17 @@ refresh_progress_meter(void)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
115 off_t bytes_left;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
116 int cur_speed;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
117 int hours, minutes, seconds;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
118 - int i, len;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
119 int file_len;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
120
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
121 + if ((!alarm_fired && !win_resized) || !can_output())
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
122 + return;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
123 + alarm_fired = 0;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
124 +
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
125 + if (win_resized) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
126 + setscreensize();
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
127 + win_resized = 0;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
128 + }
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
129 +
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
130 transferred = *counter - (cur_pos ? cur_pos : start_pos);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
131 cur_pos = *counter;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
132 now = monotime_double();
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
133 @@ -158,16 +169,11 @@ refresh_progress_meter(void)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
134
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
135 /* filename */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
136 buf[0] = '\0';
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
137 - file_len = win_size - 35;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
138 + file_len = win_size - 36;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
139 if (file_len > 0) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
140 - len = snprintf(buf, file_len + 1, "\r%s", file);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
141 - if (len < 0)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
142 - len = 0;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
143 - if (len >= file_len + 1)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
144 - len = file_len;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
145 - for (i = len; i < file_len; i++)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
146 - buf[i] = ' ';
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
147 - buf[file_len] = '\0';
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
148 + buf[0] = '\r';
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
149 + snmprintf(buf+1, sizeof(buf)-1 , &file_len, "%*s",
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
150 + file_len * -1, file);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
151 }
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
152
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
153 /* percent of transfer done */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
154 @@ -228,22 +234,11 @@ refresh_progress_meter(void)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
155
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
156 /*ARGSUSED*/
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
157 static void
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
158 -update_progress_meter(int ignore)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
159 +sig_alarm(int ignore)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
160 {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
161 - int save_errno;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
162 -
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
163 - save_errno = errno;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
164 -
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
165 - if (win_resized) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
166 - setscreensize();
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
167 - win_resized = 0;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
168 - }
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
169 - if (can_output())
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
170 - refresh_progress_meter();
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
171 -
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
172 - signal(SIGALRM, update_progress_meter);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
173 + signal(SIGALRM, sig_alarm);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
174 + alarm_fired = 1;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
175 alarm(UPDATE_INTERVAL);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
176 - errno = save_errno;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
177 }
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
178
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
179 void
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
180 @@ -259,10 +254,9 @@ start_progress_meter(const char *f, off_t filesize, off_t *ctr)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
181 bytes_per_second = 0;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
182
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
183 setscreensize();
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
184 - if (can_output())
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
185 - refresh_progress_meter();
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
186 + refresh_progress_meter();
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
187
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
188 - signal(SIGALRM, update_progress_meter);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
189 + signal(SIGALRM, sig_alarm);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
190 signal(SIGWINCH, sig_winch);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
191 alarm(UPDATE_INTERVAL);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
192 }
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
193 @@ -286,6 +280,7 @@ stop_progress_meter(void)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
194 static void
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
195 sig_winch(int sig)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
196 {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
197 + signal(SIGWINCH, sig_winch);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
198 win_resized = 1;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
199 }
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
200
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
201 diff --git a/progressmeter.h b/progressmeter.h
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
202 index bf179dca6..8f6678060 100644
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
203 --- a/progressmeter.h
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
204 +++ b/progressmeter.h
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
205 @@ -1,4 +1,4 @@
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
206 -/* $OpenBSD: progressmeter.h,v 1.3 2015/01/14 13:54:13 djm Exp $ */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
207 +/* $OpenBSD: progressmeter.h,v 1.4 2019/01/23 08:01:46 dtucker Exp $ */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
208 /*
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
209 * Copyright (c) 2002 Nils Nordman. All rights reserved.
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
210 *
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
211 @@ -24,4 +24,5 @@
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
212 */
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
213
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
214 void start_progress_meter(const char *, off_t, off_t *);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
215 +void refresh_progress_meter(void);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
216 void stop_progress_meter(void);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
217 diff --git a/scp.c b/scp.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
218 index 7163d33dc..80308573c 100644
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
219 --- a/scp.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
220 +++ b/scp.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
221 @@ -593,6 +593,7 @@ scpio(void *_cnt, size_t s)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
222 off_t *cnt = (off_t *)_cnt;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
223
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
224 *cnt += s;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
225 + refresh_progress_meter();
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
226 if (limit_kbps > 0)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
227 bandwidth_limit(&bwlimit, s);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
228 return 0;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
229 diff --git a/sftp-client.c b/sftp-client.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
230 index 4986d6d8d..2bc698f86 100644
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
231 --- a/sftp-client.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
232 +++ b/sftp-client.c
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
233 @@ -101,7 +101,9 @@ sftpio(void *_bwlimit, size_t amount)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
234 {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
235 struct bwlimit *bwlimit = (struct bwlimit *)_bwlimit;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
236
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
237 - bandwidth_limit(bwlimit, amount);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
238 + refresh_progress_meter();
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
239 + if (bwlimit != NULL)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
240 + bandwidth_limit(bwlimit, amount);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
241 return 0;
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
242 }
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
243
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
244 @@ -121,8 +123,8 @@ send_msg(struct sftp_conn *conn, struct sshbuf *m)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
245 iov[1].iov_base = (u_char *)sshbuf_ptr(m);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
246 iov[1].iov_len = sshbuf_len(m);
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
247
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
248 - if (atomiciov6(writev, conn->fd_out, iov, 2,
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
249 - conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_out) !=
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
250 + if (atomiciov6(writev, conn->fd_out, iov, 2, sftpio,
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
251 + conn->limit_kbps > 0 ? &conn->bwlimit_out : NULL) !=
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
252 sshbuf_len(m) + sizeof(mlen))
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
253 fatal("Couldn't send packet: %s", strerror(errno));
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
254
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
255 @@ -138,8 +140,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
256
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
257 if ((r = sshbuf_reserve(m, 4, &p)) != 0)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
258 fatal("%s: buffer error: %s", __func__, ssh_err(r));
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
259 - if (atomicio6(read, conn->fd_in, p, 4,
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
260 - conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in) != 4) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
261 + if (atomicio6(read, conn->fd_in, p, 4, sftpio,
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
262 + conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL) != 4) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
263 if (errno == EPIPE || errno == ECONNRESET)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
264 fatal("Connection closed");
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
265 else
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
266 @@ -157,8 +159,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
267
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
268 if ((r = sshbuf_reserve(m, msg_len, &p)) != 0)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
269 fatal("%s: buffer error: %s", __func__, ssh_err(r));
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
270 - if (atomicio6(read, conn->fd_in, p, msg_len,
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
271 - conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
272 + if (atomicio6(read, conn->fd_in, p, msg_len, sftpio,
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
273 + conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
274 != msg_len) {
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
275 if (errno == EPIPE)
f2c94d482098 network/openssh: initial import, closes #1156
David Demelier <markand@malikania.fr>
parents:
diff changeset
276 fatal("Connection closed");