diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2008-12-01 21:42:13 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2008-12-01 21:42:13 +1100 |
| commit | 23645649bb97d510a7eab33d36882ef34d2e2d1f (patch) | |
| tree | 24975a40bff63f6e48bb7209058497185f79e6f8 | |
| parent | 99d11a3ed2eb13e2f3ba13280d416369c45a30a6 (diff) | |
| download | openssh-git-23645649bb97d510a7eab33d36882ef34d2e2d1f.tar.gz | |
- dtucker@cvs.openbsd.org 2008/11/30 11:59:26
[monitor_fdpass.c]
Retry sendmsg/recvmsg on EAGAIN and EINTR; ok djm@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | monitor_fdpass.c | 12 |
2 files changed, 13 insertions, 4 deletions
@@ -8,6 +8,9 @@ packet_disconnect() on padding error, too. should reduce the success probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18 ok djm@ + - dtucker@cvs.openbsd.org 2008/11/30 11:59:26 + [monitor_fdpass.c] + Retry sendmsg/recvmsg on EAGAIN and EINTR; ok djm@ 20081123 - (dtucker) [monitor_fdpass.c] Reduce diff vs OpenBSD by moving some @@ -4942,5 +4945,5 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5146 2008/12/01 10:40:48 dtucker Exp $ +$Id: ChangeLog,v 1.5147 2008/12/01 10:42:13 dtucker Exp $ diff --git a/monitor_fdpass.c b/monitor_fdpass.c index f68c3728..4b9a066b 100644 --- a/monitor_fdpass.c +++ b/monitor_fdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_fdpass.c,v 1.17 2008/03/24 16:11:07 deraadt Exp $ */ +/* $OpenBSD: monitor_fdpass.c,v 1.18 2008/11/30 11:59:26 dtucker Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -75,7 +75,10 @@ mm_send_fd(int sock, int fd) msg.msg_iov = &vec; msg.msg_iovlen = 1; - if ((n = sendmsg(sock, &msg, 0)) == -1) { + while ((n = sendmsg(sock, &msg, 0)) == -1 && (errno == EAGAIN || + errno == EINTR)) + debug3("%s: sendmsg(%d): %s", __func__, fd, strerror(errno)); + if (n == -1) { error("%s: sendmsg(%d): %s", __func__, fd, strerror(errno)); return -1; @@ -123,7 +126,10 @@ mm_receive_fd(int sock) msg.msg_controllen = sizeof(cmsgbuf.buf); #endif - if ((n = recvmsg(sock, &msg, 0)) == -1) { + while ((n = recvmsg(sock, &msg, 0)) == -1 && (errno == EAGAIN || + errno == EINTR)) + debug3("%s: recvmsg: %s", __func__, strerror(errno)); + if (n == -1) { error("%s: recvmsg: %s", __func__, strerror(errno)); return -1; } |