- 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@
This commit is contained in:
Damien Miller 2010-12-01 12:02:14 +11:00
parent 6a740e7b92
commit d0fdd6818c
2 changed files with 6 additions and 2 deletions

View File

@ -16,6 +16,10 @@
[auth.c] [auth.c]
use strict_modes already passed as function argument over referencing use strict_modes already passed as function argument over referencing
global options.strict_modes 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 20101124
- (dtucker) [platform.c session.c] Move the getluid call out of session.c and - (dtucker) [platform.c session.c] Move the getluid call out of session.c and

View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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(); packet_check_eom();
} }
if (reply) { if (reply && c != NULL) {
packet_start(success ? packet_start(success ?
SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE); SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE);
packet_put_int(c->remote_id); packet_put_int(c->remote_id);