* New upstream release (closes: #536182). Yes, I know 5.3p1 has been out

  for a while, but there's no GSSAPI patch available for it yet.
  - Change the default cipher order to prefer the AES CTR modes and the
    revised "arcfour256" mode to CBC mode ciphers that are susceptible to
    CPNI-957037 "Plaintext Recovery Attack Against SSH".
  - Add countermeasures to mitigate CPNI-957037-style attacks against the
    SSH protocol's use of CBC-mode ciphers. Upon detection of an invalid
    packet length or Message Authentication Code, ssh/sshd will continue
    reading up to the maximum supported packet length rather than
    immediately terminating the connection. This eliminates most of the
    known differences in behaviour that leaked information about the
    plaintext of injected data which formed the basis of this attack
    (closes: #506115, LP: #379329).
  - ForceCommand directive now accepts commandline arguments for the
    internal-sftp server (closes: #524423, LP: #362511).
  - Add AllowAgentForwarding to available Match keywords list (closes:
    #540623).
  - Make ssh(1) send the correct channel number for
    SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to
    avoid triggering 'Non-public channel' error messages on sshd(8) in
    openssh-5.1.
  - Avoid printing 'Non-public channel' warnings in sshd(8), since the
    ssh(1) has sent incorrect channel numbers since ~2004 (this reverts a
    behaviour introduced in openssh-5.1; closes: #496017).
* Update to GSSAPI patch from
  http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch,
  including cascading credentials support (LP: #416958).

1 files changed, 18 insertions, 11 deletions

diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 28296d64b..3d3a78391 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.
@@ -69,17 +69,16 @@ mm_send_fd(int sock, int fd)
 {
 #if defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR))
         struct msghdr msg;
-        struct iovec vec;
-        char ch = '\0';
-        ssize_t n;
 #ifndef HAVE_ACCRIGHTS_IN_MSGHDR
         union {
                 struct cmsghdr hdr;
-                char tmp[CMSG_SPACE(sizeof(int))];
                 char buf[CMSG_SPACE(sizeof(int))];
         } cmsgbuf;
         struct cmsghdr *cmsg;
 #endif
+        struct iovec vec;
+        char ch = '\0';
+        ssize_t n;
 
         memset(&msg, 0, sizeof(msg));
 #ifdef HAVE_ACCRIGHTS_IN_MSGHDR
@@ -100,7 +99,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,10 +125,6 @@ mm_receive_fd(int sock)
 {
 #if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR))
         struct msghdr msg;
-        struct iovec vec;
-        ssize_t n;
-        char ch;
-        int fd;
 #ifndef HAVE_ACCRIGHTS_IN_MSGHDR
         union {
                 struct cmsghdr hdr;
@@ -134,6 +132,10 @@ mm_receive_fd(int sock)
         } cmsgbuf;
         struct cmsghdr *cmsg;
 #endif
+        struct iovec vec;
+        ssize_t n;
+        char ch;
+        int fd;
 
         memset(&msg, 0, sizeof(msg));
         vec.iov_base = &ch;
@@ -148,10 +150,14 @@ 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;
         }
+
         if (n != 1) {
                 error("%s: recvmsg: expected received 1 got %ld",
                     __func__, (long)n);
@@ -169,6 +175,7 @@ mm_receive_fd(int sock)
                 error("%s: no message header", __func__);
                 return -1;
         }
+
         if (!cmsg_type_is_broken() && cmsg->cmsg_type != SCM_RIGHTS) {
                 error("%s: expected type %d got %d", __func__,
                     SCM_RIGHTS, cmsg->cmsg_type);