CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-04 16:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: fix CVE-2024-0208 GVCP dissector crash

Browse Source 
Upstream-Status: Backport from a8586fde3a

Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Hitendra Prajapati 2024-01-10 10:40:57 +05:30 committed by Armin Kuster
parent 10d8982782
commit 84a84000f7
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta-networking/recipes-support/wireshark/files/CVE-2024-0208.patch Normal file
View File

@ -0,0 +1,42 @@
From a8586fde3a6512466afb2a660538ef3fe712076b Mon Sep 17 00:00:00 2001
From: John Thacker <johnthacker@gmail.com>
Date: Thu, 23 Nov 2023 13:47:51 -0500
Subject: [PATCH] gvcp: Don't try to add a NULL string to a column
This was caught as an invalid argument by g_strlcpy before 4.2,
but it was never a good idea.
Fix #19496
Upstream-Status: Backport [https://gitlab.com/wireshark/wireshark/-/commit/a8586fde3a6512466afb2a660538ef3fe712076b]
CVE: CVE-2024-0208
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
---
epan/dissectors/packet-gvcp.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c
index 2de4552..b94ddea 100644
--- a/epan/dissectors/packet-gvcp.c
+++ b/epan/dissectors/packet-gvcp.c
@@ -2222,15 +2222,12 @@ static void dissect_readreg_ack(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, p
if (addr_list_size > 0)
{
address_string = get_register_name_from_address(*((guint32*)wmem_array_index(gvcp_trans->addr_list, 0)), gvcp_info, &is_custom_register);
+ col_append_str(pinfo->cinfo, COL_INFO, address_string);
}
if (num_registers)
{
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s Value=0x%08X", address_string, tvb_get_ntohl(tvb, offset));
- }
- else
- {
- col_append_str(pinfo->cinfo, COL_INFO, address_string);
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "Value=0x%08X", tvb_get_ntohl(tvb, offset));
}
}
}
--
2.25.1

1
meta-networking/recipes-support/wireshark/wireshark_3.2.18.bb
View File

@ -21,6 +21,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz
file://CVE-2023-3649.patch \
file://CVE-2022-0585-CVE-2023-2879.patch \
file://CVE-2022-4345.patch \
file://CVE-2024-0208.patch \
"
UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"