aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2008-04-17 00:00:54 +0000
committerColin Percival <cperciva@FreeBSD.org>2008-04-17 00:00:54 +0000
commitf5f3db0e5a6d6972fdcfb14d64508ca2feaa2ead (patch)
tree728db4a377568c32e84769fee265b2b9e9607da9
parenta3287dcbb9906efb2b0db7880b99b22e377c82cb (diff)
downloadsrc-releng/6.1.tar.gz
src-releng/6.1.zip
Fix logic error in sshd(8) concerning the handling of failedreleng/6.1
attempts to bind ports for X11 forwarding. Security: FreeBSD-SA-08:05.openssh Approved by: so (cperciva)
Notes
Notes: svn path=/releng/6.1/; revision=178263
-rw-r--r--UPDATING4
-rw-r--r--crypto/openssh/channels.c3
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 5 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 118be560cf18..bb0bdc145495 100644
--- a/UPDATING
+++ b/UPDATING
@@ -8,6 +8,10 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running
portupgrade.
+20080416: p24 FreeBSD-SA-08:05.openssh
+ Fix logic error in sshd(8) concerning the handling of failed
+ attempts to bind ports for X11 forwarding.
+
20080214: p23 FreeBSD-SA-08:02.sendfile
Fix sendfile(2) write-only file permission bypass.
diff --git a/crypto/openssh/channels.c b/crypto/openssh/channels.c
index 8c7b2b369000..8986d0a461c3 100644
--- a/crypto/openssh/channels.c
+++ b/crypto/openssh/channels.c
@@ -2708,9 +2708,6 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
debug2("bind port %d: %.100s", port, strerror(errno));
close(sock);
- if (ai->ai_next)
- continue;
-
for (n = 0; n < num_socks; n++) {
close(socks[n]);
}
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index d78740abaeb4..49b131a1bb8f 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="6.1"
-BRANCH="RELEASE-p23"
+BRANCH="RELEASE-p24"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi