diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-01-23 09:01:46 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-01-24 02:30:30 +0100 |
| commit | 8976f1c4b2721c26e878151f52bdf346dfe2d54c (patch) | |
| tree | 528e309cbe5944c0127a1c3fa0752fe2f9701232 /atomicio.c | |
| parent | For broken read/readv comparisons, poll(RW). (diff) | |
| download | openssh-8976f1c4b2721c26e878151f52bdf346dfe2d54c.tar.xz openssh-8976f1c4b2721c26e878151f52bdf346dfe2d54c.zip | |
upstream: Sanitize scp filenames via snmprintf. To do this we move
the progressmeter formatting outside of signal handler context and have the
atomicio callback called for EINTR too. bz#2434 with contributions from djm
and jjelen at redhat.com, ok djm@
OpenBSD-Commit-ID: 1af61c1f70e4f3bd8ab140b9f1fa699481db57d8
Diffstat (limited to 'atomicio.c')
| -rw-r--r-- | atomicio.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/atomicio.c b/atomicio.c index cffa9fa7d..845b328ee 100644 --- a/atomicio.c +++ b/atomicio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atomicio.c,v 1.28 2016/07/27 23:18:12 djm Exp $ */ +/* $OpenBSD: atomicio.c,v 1.29 2019/01/23 08:01:46 dtucker Exp $ */ /* * Copyright (c) 2006 Damien Miller. All rights reserved. * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved. @@ -67,9 +67,14 @@ atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n, res = (f) (fd, s + pos, n - pos); switch (res) { case -1: - if (errno == EINTR) + if (errno == EINTR) { + /* possible SIGALARM, update callback */ + if (cb != NULL && cb(cb_arg, 0) == -1) { + errno = EINTR; + return pos; + } continue; - if (errno == EAGAIN || errno == EWOULDBLOCK) { + } else if (errno == EAGAIN || errno == EWOULDBLOCK) { (void)poll(&pfd, 1, -1); continue; } @@ -124,9 +129,14 @@ atomiciov6(ssize_t (*f) (int, const struct iovec *, int), int fd, res = (f) (fd, iov, iovcnt); switch (res) { case -1: - if (errno == EINTR) + if (errno == EINTR) { + /* possible SIGALARM, update callback */ + if (cb != NULL && cb(cb_arg, 0) == -1) { + errno = EINTR; + return pos; + } continue; - if (errno == EAGAIN || errno == EWOULDBLOCK) { + } else if (errno == EAGAIN || errno == EWOULDBLOCK) { (void)poll(&pfd, 1, -1); continue; } |