diff options
| -rw-r--r-- | meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch | 48 | ||||
| -rw-r--r-- | meta-networking/recipes-support/ettercap/ettercap_0.8.4.1.bb (renamed from meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb) | 3 |
2 files changed, 1 insertions, 50 deletions
diff --git a/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch b/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch deleted file mode 100644 index e1b19ea05b..0000000000 --- a/meta-networking/recipes-support/ettercap/ettercap/CVE-2026-3606.patch +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | From a7347f49b928f47fc37805c9f3a70a9487d45a65 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Koeppe <alexander@koeppe.rocks> | ||
| 3 | Date: Sun, 8 Mar 2026 17:57:39 +0100 | ||
| 4 | Subject: [PATCH] Fix heap-out-of-bounds read issue in etterfilter | ||
| 5 | (CVE-2026-3606) | ||
| 6 | |||
| 7 | CVE: CVE-2026-3603 | ||
| 8 | Upstream-Status: Backport [https://github.com/Ettercap/ettercap/commit/41c312d4be6f6067968a275bf66b2abd2a0ba385] | ||
| 9 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 10 | --- | ||
| 11 | include/ec.h | 6 ++++++ | ||
| 12 | utils/etterfilter/ef_output.c | 4 ++-- | ||
| 13 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/include/ec.h b/include/ec.h | ||
| 16 | index d69de613..80c7eaba 100644 | ||
| 17 | --- a/include/ec.h | ||
| 18 | +++ b/include/ec.h | ||
| 19 | @@ -94,6 +94,12 @@ | ||
| 20 | ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 21 | } while(0) | ||
| 22 | |||
| 23 | +#define SAFE_RECALLOC(x, s) do { \ | ||
| 24 | + x = realloc(x, s); \ | ||
| 25 | + ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 26 | + memset(x, 0, s); \ | ||
| 27 | +} while(0) | ||
| 28 | + | ||
| 29 | #define SAFE_STRDUP(x, s) do{ \ | ||
| 30 | x = strdup(s); \ | ||
| 31 | ON_ERROR(x, NULL, "virtual memory exhausted"); \ | ||
| 32 | diff --git a/utils/etterfilter/ef_output.c b/utils/etterfilter/ef_output.c | ||
| 33 | index 2530e599..2f49177e 100644 | ||
| 34 | --- a/utils/etterfilter/ef_output.c | ||
| 35 | +++ b/utils/etterfilter/ef_output.c | ||
| 36 | @@ -150,10 +150,10 @@ static size_t create_data_segment(u_char** data, struct filter_header *fh, struc | ||
| 37 | static size_t add_data_segment(u_char **data, size_t base, u_char **string, size_t slen) | ||
| 38 | { | ||
| 39 | /* make room for the new string */ | ||
| 40 | - SAFE_REALLOC(*data, base + slen + 1); | ||
| 41 | + SAFE_RECALLOC(*data, base + slen + 1); | ||
| 42 | |||
| 43 | /* copy the string, NULL separated */ | ||
| 44 | - memcpy(*data + base, *string, slen + 1); | ||
| 45 | + memcpy(*data + base, *string, slen); | ||
| 46 | |||
| 47 | /* | ||
| 48 | * change the pointer to the new string location | ||
diff --git a/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.1.bb index 6fac3a0b84..a28de7b2bd 100644 --- a/meta-networking/recipes-support/ettercap/ettercap_0.8.4.bb +++ b/meta-networking/recipes-support/ettercap/ettercap_0.8.4.1.bb | |||
| @@ -22,10 +22,9 @@ DEPENDS += "ethtool \ | |||
| 22 | RDEPENDS:${PN} += "bash ethtool libgcc" | 22 | RDEPENDS:${PN} += "bash ethtool libgcc" |
| 23 | 23 | ||
| 24 | SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https;tag=v${PV} \ | 24 | SRC_URI = "gitsm://github.com/Ettercap/ettercap;branch=master;protocol=https;tag=v${PV} \ |
| 25 | file://CVE-2026-3606.patch \ | ||
| 26 | " | 25 | " |
| 27 | 26 | ||
| 28 | SRCREV = "41da65f4026a9e4cea928e61941b976d9279f508" | 27 | SRCREV = "0dc8409779f3a09cbfff4434b9a4d7b33480d88d" |
| 29 | 28 | ||
| 30 | EXTRA_OECMAKE = " \ | 29 | EXTRA_OECMAKE = " \ |
| 31 | -DCMAKE_SKIP_RPATH=TRUE \ | 30 | -DCMAKE_SKIP_RPATH=TRUE \ |
