|
 |
eb5047 |
From 0e4e9825e637a15707a910539d71fe65e7e12d7b Mon Sep 17 00:00:00 2001
|
|
|
eb5047 |
From: Kamil Dudka <kdudka@redhat.com>
|
|
|
eb5047 |
Date: Tue, 19 Mar 2019 13:45:22 +0100
|
|
|
eb5047 |
Subject: [PATCH] Resolves: CVE-2019-3862 - fix out-of-bounds memory comparison
|
|
|
eb5047 |
|
|
|
eb5047 |
... with specially crafted message channel request
|
|
|
eb5047 |
|
|
|
eb5047 |
Upstream-Patch: https://libssh2.org/1.8.0-CVE/CVE-2019-3862.patch
|
|
|
eb5047 |
---
|
|
|
eb5047 |
src/packet.c | 14 ++++++++------
|
|
|
eb5047 |
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
eb5047 |
|
|
|
eb5047 |
diff --git a/src/packet.c b/src/packet.c
|
|
|
eb5047 |
index aa10633..c950b5d 100644
|
|
|
eb5047 |
--- a/src/packet.c
|
|
|
eb5047 |
+++ b/src/packet.c
|
|
|
eb5047 |
@@ -775,8 +775,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
|
|
|
eb5047 |
uint32_t len = _libssh2_ntohu32(data + 5);
|
|
|
eb5047 |
unsigned char want_reply = 1;
|
|
|
eb5047 |
|
|
|
eb5047 |
- if(len < (datalen - 10))
|
|
|
eb5047 |
- want_reply = data[9 + len];
|
|
|
eb5047 |
+ if((len + 9) < datalen)
|
|
|
eb5047 |
+ want_reply = data[len + 9];
|
|
|
eb5047 |
|
|
|
eb5047 |
_libssh2_debug(session,
|
|
|
eb5047 |
LIBSSH2_TRACE_CONN,
|
|
|
eb5047 |
@@ -784,6 +784,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
|
|
|
eb5047 |
channel, len, data + 9, want_reply);
|
|
|
eb5047 |
|
|
|
eb5047 |
if (len == sizeof("exit-status") - 1
|
|
|
eb5047 |
+ && (sizeof("exit-status") - 1 + 9) <= datalen
|
|
|
eb5047 |
&& !memcmp("exit-status", data + 9,
|
|
|
eb5047 |
sizeof("exit-status") - 1)) {
|
|
|
eb5047 |
|
|
|
eb5047 |
@@ -792,7 +793,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
|
|
|
eb5047 |
channelp =
|
|
|
eb5047 |
_libssh2_channel_locate(session, channel);
|
|
|
eb5047 |
|
|
|
eb5047 |
- if (channelp) {
|
|
|
eb5047 |
+ if (channelp && (sizeof("exit-status") + 13) <= datalen) {
|
|
|
eb5047 |
channelp->exit_status =
|
|
|
eb5047 |
_libssh2_ntohu32(data + 9 + sizeof("exit-status"));
|
|
|
eb5047 |
_libssh2_debug(session, LIBSSH2_TRACE_CONN,
|
|
|
eb5047 |
@@ -805,13 +806,14 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
|
|
|
eb5047 |
|
|
|
eb5047 |
}
|
|
|
eb5047 |
else if (len == sizeof("exit-signal") - 1
|
|
|
eb5047 |
+ && (sizeof("exit-signal") - 1 + 9) <= datalen
|
|
|
eb5047 |
&& !memcmp("exit-signal", data + 9,
|
|
|
eb5047 |
sizeof("exit-signal") - 1)) {
|
|
|
eb5047 |
/* command terminated due to signal */
|
|
|
eb5047 |
if(datalen >= 20)
|
|
|
eb5047 |
channelp = _libssh2_channel_locate(session, channel);
|
|
|
eb5047 |
|
|
|
eb5047 |
- if (channelp) {
|
|
|
eb5047 |
+ if (channelp && (sizeof("exit-signal") + 13) <= datalen) {
|
|
|
eb5047 |
/* set signal name (without SIG prefix) */
|
|
|
eb5047 |
uint32_t namelen =
|
|
|
eb5047 |
_libssh2_ntohu32(data + 9 + sizeof("exit-signal"));
|
|
|
eb5047 |
@@ -827,9 +829,9 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
|
|
|
eb5047 |
if (!channelp->exit_signal)
|
|
|
eb5047 |
rc = _libssh2_error(session, LIBSSH2_ERROR_ALLOC,
|
|
|
eb5047 |
"memory for signal name");
|
|
|
eb5047 |
- else {
|
|
|
eb5047 |
+ else if ((sizeof("exit-signal") + 13 + namelen <= datalen)) {
|
|
|
eb5047 |
memcpy(channelp->exit_signal,
|
|
|
eb5047 |
- data + 13 + sizeof("exit_signal"), namelen);
|
|
|
eb5047 |
+ data + 13 + sizeof("exit-signal"), namelen);
|
|
|
eb5047 |
channelp->exit_signal[namelen] = '\0';
|
|
|
eb5047 |
/* TODO: save error message and language tag */
|
|
|
eb5047 |
_libssh2_debug(session, LIBSSH2_TRACE_CONN,
|
|
|
eb5047 |
--
|
|
|
eb5047 |
2.17.2
|
|
|
eb5047 |
|