diff options
| author | Damien Miller <djm@mindrot.org> | 2008-04-02 23:43:57 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-04-02 23:43:57 +0200 |
| commit | 5f5cd746f357a87637a6a91605a44e1ed9a6dab1 (patch) | |
| tree | 8349920edaf26fb421887ff47533809c7262b2f5 /channels.c | |
| parent | - (djm) Release 4.9p1 (diff) | |
| download | openssh-5f5cd746f357a87637a6a91605a44e1ed9a6dab1.tar.xz openssh-5f5cd746f357a87637a6a91605a44e1ed9a6dab1.zip | |
- markus@cvs.openbsd.org 2008/04/02 15:36:51
[channels.c]
avoid possible hijacking of x11-forwarded connections (back out 1.183)
CVE-2008-1483; ok djm@
Diffstat (limited to '')
| -rw-r--r-- | channels.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/channels.c b/channels.c index c766cc275..b6bd901f0 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.272 2008/01/19 23:02:40 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.273 2008/04/02 21:36:51 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2906,9 +2906,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]); } |