File xrdp-cve-2020-4044-fix-1.patch of Package xrdp.29105
From 7384f6e574c348dc4a753ac9245ff25a6014fbe7 Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Mon, 29 Jun 2020 11:22:13 +0100
Subject: [PATCH] Fixed CVE-2020-4044 CI errors
---
sesman/libscp/libscp_v0.c | 12 ++++++------
sesman/libscp/libscp_v1s.c | 6 +++---
sesman/libscp/libscp_v1s_mng.c | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
Index: xrdp-0.9.0~git.1456906198.f422461/sesman/libscp/libscp_v0.c
===================================================================
--- xrdp-0.9.0~git.1456906198.f422461.orig/sesman/libscp/libscp_v0.c
+++ xrdp-0.9.0~git.1456906198.f422461/sesman/libscp/libscp_v0.c
@@ -95,7 +95,7 @@ enum SCP_CLIENT_STATES_E
scp_v0c_connect(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
{
tui32 version;
- tui32 size;
+ int size;
tui16 sz;
init_stream(c->in_s, c->in_s->size);
@@ -183,8 +183,8 @@ scp_v0c_connect(struct SCP_CONNECTION *c
if (size < (8 + 2 + 2 + 2) || size > SCP_MAX_MESSAGE_SIZE)
{
log_message(LOG_LEVEL_WARNING,
- "[v0:%d] connection aborted: msg size = %u",
- __LINE__, (unsigned int)size);
+ "[v0:%d] connection aborted: msg size = %d",
+ __LINE__, size);
return SCP_CLIENT_STATE_SIZE_ERR;
}
@@ -236,7 +236,7 @@ scp_v0c_connect(struct SCP_CONNECTION *c
static enum SCP_SERVER_STATES_E
scp_v0s_init_session(struct SCP_CONNECTION *c, struct SCP_SESSION *session)
{
- tui32 size;
+ int size;
tui16 height;
tui16 width;
tui16 bpp;
@@ -250,8 +250,8 @@ scp_v0s_init_session(struct SCP_CONNECTI
if (size < (8 + 2) || size > SCP_MAX_MESSAGE_SIZE)
{
log_message(LOG_LEVEL_WARNING,
- "[v0:%d] connection aborted: msg size = %u",
- __LINE__, (unsigned int)size);
+ "[v0:%d] connection aborted: msg size = %d",
+ __LINE__, size);
return SCP_SERVER_STATE_SIZE_ERR;
}
Index: xrdp-0.9.0~git.1456906198.f422461/sesman/libscp/libscp_v1s.c
===================================================================
--- xrdp-0.9.0~git.1456906198.f422461.orig/sesman/libscp/libscp_v1s.c
+++ xrdp-0.9.0~git.1456906198.f422461/sesman/libscp/libscp_v1s.c
@@ -214,7 +214,7 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(
enum SCP_SERVER_STATES_E result;
struct SCP_SESSION *session;
tui32 version;
- tui32 size;
+ int size;
tui16 cmdset;
tui16 cmd;
@@ -349,7 +349,7 @@ enum SCP_SERVER_STATES_E
scp_v1s_request_password(struct SCP_CONNECTION *c, struct SCP_SESSION *s, char *reason)
{
tui32 version;
- tui32 size;
+ int size;
tui16 cmdset;
tui16 cmd;
int rlen;
@@ -536,7 +536,7 @@ enum SCP_SERVER_STATES_E
scp_v1s_list_sessions(struct SCP_CONNECTION *c, int sescnt, struct SCP_DISCONNECTED_SESSION *ds, SCP_SID *sid)
{
tui32 version = 1;
- tui32 size = 12;
+ int size = 12;
tui16 cmd = 40;
int pktcnt;
int idx;
Index: xrdp-0.9.0~git.1456906198.f422461/sesman/libscp/libscp_v1s_mng.c
===================================================================
--- xrdp-0.9.0~git.1456906198.f422461.orig/sesman/libscp/libscp_v1s_mng.c
+++ xrdp-0.9.0~git.1456906198.f422461/sesman/libscp/libscp_v1s_mng.c
@@ -370,7 +370,7 @@ static enum SCP_SERVER_STATES_E
_scp_v1s_mng_check_response(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
{
tui32 version;
- tui32 size;
+ int size;
tui16 cmd;
// tui8 dim;
// char buf[257];