mirror of
https://git.yoctoproject.org/meta-security
synced 2026-01-11 15:00:34 +00:00
94f04a4dc2
Upstream-Status: Backport from226580d502&&9037ea3511Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com> Signed-off-by: Scott Murray <scott.murray@konsulko.com>
80 lines
2.7 KiB
Diff
80 lines
2.7 KiB
Diff
From 226580d502ae98c148aaecc4846f78694b5e253c Mon Sep 17 00:00:00 2001
|
|
From: Philippe Antoine <contact@catenacyber.fr>
|
|
Date: Tue, 11 Mar 2025 16:45:35 +0100
|
|
Subject: [PATCH] decompressors: do not take data after end
|
|
|
|
|
|
CVE: CVE-2025-53537
|
|
Upstream-Status: Backport [https://github.com/OISF/libhtp/commit/226580d502ae98c148aaecc4846f78694b5e253c]
|
|
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
|
|
---
|
|
htp/htp_core.h | 5 ++++-
|
|
htp/htp_decompressors.c | 21 ++++++++++++---------
|
|
2 files changed, 16 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/htp/htp_core.h b/htp/htp_core.h
|
|
index 7c23212..fb142c9 100644
|
|
--- a/htp/htp_core.h
|
|
+++ b/htp/htp_core.h
|
|
@@ -161,7 +161,10 @@ enum htp_content_encoding_t {
|
|
HTP_COMPRESSION_DEFLATE = 3,
|
|
|
|
/** LZMA compression. */
|
|
- HTP_COMPRESSION_LZMA = 4
|
|
+ HTP_COMPRESSION_LZMA = 4,
|
|
+
|
|
+ /** No more data. */
|
|
+ HTP_COMPRESSION_OVER = 5
|
|
};
|
|
|
|
/**
|
|
diff --git a/htp/htp_decompressors.c b/htp/htp_decompressors.c
|
|
index 19950df..0d94c30 100644
|
|
--- a/htp/htp_decompressors.c
|
|
+++ b/htp/htp_decompressors.c
|
|
@@ -203,6 +203,8 @@ htp_status_t htp_gzip_decompressor_decompress(htp_decompressor_t *drec1, htp_tx_
|
|
}
|
|
|
|
return HTP_OK;
|
|
+ } else if (drec->zlib_initialized == HTP_COMPRESSION_OVER) {
|
|
+ return HTP_ERROR;
|
|
}
|
|
|
|
if (d->data == NULL) {
|
|
@@ -316,15 +318,9 @@ restart:
|
|
// no initialization means previous error on stream
|
|
return HTP_ERROR;
|
|
}
|
|
- if (GZIP_BUF_SIZE > drec->stream.avail_out) {
|
|
- if (rc == Z_DATA_ERROR) {
|
|
- // There is data even if there is an error
|
|
- // So use this data and log a warning
|
|
- htp_log(d->tx->connp, HTP_LOG_MARK, HTP_LOG_WARNING, 0, "GZip decompressor: inflate failed with %d", rc);
|
|
- rc = Z_STREAM_END;
|
|
- }
|
|
- }
|
|
- if (rc == Z_STREAM_END) {
|
|
+
|
|
+ int error_after_data = (rc == Z_DATA_ERROR && drec->restart == 0 && GZIP_BUF_SIZE > drec->stream.avail_out);
|
|
+ if (rc == Z_STREAM_END || error_after_data) {
|
|
// How many bytes do we have?
|
|
size_t len = GZIP_BUF_SIZE - drec->stream.avail_out;
|
|
|
|
@@ -351,6 +347,13 @@ restart:
|
|
drec->stream.next_out = drec->buffer;
|
|
// TODO Handle trailer.
|
|
|
|
+ if (error_after_data) {
|
|
+ // There is data even if there is an error
|
|
+ // So use this data and log a warning
|
|
+ htp_log(d->tx->connp, HTP_LOG_MARK, HTP_LOG_WARNING, 0, "GZip decompressor: inflate failed with %d", rc);
|
|
+ drec->zlib_initialized = HTP_COMPRESSION_OVER;
|
|
+ return HTP_ERROR;
|
|
+ }
|
|
return HTP_OK;
|
|
}
|
|
else if (rc != Z_OK) {
|
|
--
|
|
2.50.1
|
|
|