47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From 086085772c067616055b3eb3445ee8e50c80ae04 Mon Sep 17 00:00:00 2001
|
|
From: Rainer Gerhards <rgerhards@adiscon.com>
|
|
Date: Fri, 22 Apr 2022 09:49:46 +0200
|
|
Subject: [PATCH] net bugfix: potential buffer overrun
|
|
|
|
Conflict:no introduced imhttp.c
|
|
Reference:https://github.com/rsyslog/rsyslog/commit/89955b0bcb1ff105e1374aad7e0e993faa6a038f
|
|
|
|
---
|
|
plugins/imptcp/imptcp.c | 4 +++-
|
|
runtime/tcps_sess.c | 4 +++-
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c
|
|
index cdd29d4..e47a7c9 100644
|
|
--- a/plugins/imptcp/imptcp.c
|
|
+++ b/plugins/imptcp/imptcp.c
|
|
@@ -1107,7 +1107,9 @@ processDataRcvd(ptcpsess_t *const __restrict__ pThis,
|
|
if(pThis->iOctetsRemain <= 200000000) {
|
|
pThis->iOctetsRemain = pThis->iOctetsRemain * 10 + c - '0';
|
|
}
|
|
- *(pThis->pMsg + pThis->iMsg++) = c;
|
|
+ if(pThis->iMsg < iMaxLine) {
|
|
+ *(pThis->pMsg + pThis->iMsg++) = c;
|
|
+ }
|
|
} else { /* done with the octet count, so this must be the SP terminator */
|
|
DBGPRINTF("TCP Message with octet-counter, size %d.\n", pThis->iOctetsRemain);
|
|
prop.GetString(pThis->peerName, &propPeerName, &lenPeerName);
|
|
diff --git a/runtime/tcps_sess.c b/runtime/tcps_sess.c
|
|
index 58528c8..4170688 100644
|
|
--- a/runtime/tcps_sess.c
|
|
+++ b/runtime/tcps_sess.c
|
|
@@ -387,7 +387,9 @@ processDataRcvd(tcps_sess_t *pThis,
|
|
if(pThis->iOctetsRemain <= 200000000) {
|
|
pThis->iOctetsRemain = pThis->iOctetsRemain * 10 + c - '0';
|
|
}
|
|
- *(pThis->pMsg + pThis->iMsg++) = c;
|
|
+ if(pThis->iMsg < iMaxLine) {
|
|
+ *(pThis->pMsg + pThis->iMsg++) = c;
|
|
+ }
|
|
} else { /* done with the octet count, so this must be the SP terminator */
|
|
DBGPRINTF("TCP Message with octet-counter, size %d.\n", pThis->iOctetsRemain);
|
|
prop.GetString(pThis->fromHost, &propPeerName, &lenPeerName);
|
|
--
|
|
2.27.0
|
|
|