diff options
| author | Damien Miller <djm@mindrot.org> | 2010-12-01 12:02:14 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-12-01 12:02:14 +1100 |
| commit | d0fdd6818c1633656fd47ee1de9438130eb9eb03 (patch) | |
| tree | 4f1f09bdfaa8f2c3c3574e347b76b2982a3771ee | |
| parent | 6a740e7b92c8dba96e81ad3979849e7abcd26829 (diff) | |
- djm@cvs.openbsd.org 2010/11/23 23:57:24
[clientloop.c]
avoid NULL deref on receiving a channel request on an unknown or invalid
channel; report bz#1842 from jchadima AT redhat.com; ok dtucker@
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | clientloop.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -16,6 +16,10 @@ [auth.c] use strict_modes already passed as function argument over referencing global options.strict_modes + - djm@cvs.openbsd.org 2010/11/23 23:57:24 + [clientloop.c] + avoid NULL deref on receiving a channel request on an unknown or invalid + channel; report bz#1842 from jchadima AT redhat.com; ok dtucker@ 20101124 - (dtucker) [platform.c session.c] Move the getluid call out of session.c and diff --git a/clientloop.c b/clientloop.c index 076386cc..91eea856 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.225 2010/11/21 01:01:13 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.226 2010/11/23 23:57:24 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1933,7 +1933,7 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt) } packet_check_eom(); } - if (reply) { + if (reply && c != NULL) { packet_start(success ? SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE); packet_put_int(c->remote_id); |