已关闭
fix CVE-2026-76926 #346
hanjinpeng创建于 16 天前关闭于 15 天前
fix CVE-2026-76926 #346
已关闭
从已删除 :backport-wireshark-openEuler-20.03-LTS-SP4-20260819合入到src-openeuler/wiresharkopenEuler-20.03-LTS-SP4
共 2 个文件变更+44-1
| @@ -0,0 +1,36 @@ | |||
| 1 | +Origin: https://github.com/wireshark/wireshark/commit/8e984f1f8360d90c5250c1a77b8754f3ce64890b | ||
| 2 | +From 0223f7040a17abb7f1744cb39e728f8977d96e08 Mon Sep 17 00:00:00 2001 | ||
| 3 | +From: John Thacker <johnthacker@gmail.com> | ||
| 4 | +Date: Thu, 23 Jul 2026 23:32:57 -0400 | ||
| 5 | +Subject: [PATCH] wiretap: busmaster: Do not exit the program on a malformed | ||
| 6 | + file | ||
| 7 | + | ||
| 8 | +Report a malformed header as a bad file and have that handled through | ||
| 9 | +the normal wiretap error routines, instead of rudely exiting the | ||
| 10 | +process. | ||
| 11 | + | ||
| 12 | +Fix #21435 | ||
| 13 | + | ||
| 14 | +Thanks to AISLE Security and AISLE:Snapshot for the report, PoC and suggested | ||
| 15 | +patch. | ||
| 16 | +--- | ||
| 17 | + wiretap/busmaster_scanner.l | 6 +++++- | ||
| 18 | + 1 file changed, 5 insertions(+), 1 deletion(-) | ||
| 19 | + | ||
| 20 | +diff --git a/wiretap/busmaster_scanner.l b/wiretap/busmaster_scanner.l | ||
| 21 | +index 4a352b9..c347f4c 100644 | ||
| 22 | +--- a/wiretap/busmaster_scanner.l | ||
| 23 | ++++ b/wiretap/busmaster_scanner.l | ||
| 24 | + NUM (0x)?[0-9A-Fa-f]+ | ||
| 25 | + | ||
| 26 | + <*>{SPC} ; | ||
| 27 | + <INITIAL>{ENDL} { yyterminate(); }; | ||
| 28 | +-<HEADER,TIME>{ENDL} { YY_FATAL_ERROR("Unterminated header statement"); } | ||
| 29 | ++<HEADER,TIME>{ENDL} { | ||
| 30 | ++ yyextra->err = WTAP_ERR_BAD_FILE; | ||
| 31 | ++ yyextra->err_info = g_strdup("Unterminated header statement"); | ||
| 32 | ++ yyterminate(); | ||
| 33 | ++ } | ||
| 34 | + | ||
| 35 | + "***" { BEGIN(HEADER); } | ||
| 36 | + <HEADER,TIME>"***"{ENDL}"***" { BEGIN(HEADER); return TOKEN_ENDL; } | ||
| @@ -5,7 +5,7 @@ | |||
| 5 | Summary: Network traffic analyzer | 5 | Summary: Network traffic analyzer |
| 6 | Name: wireshark | 6 | Name: wireshark |
| 7 | Version: 3.6.14 | 7 | Version: 3.6.14 |
| 8 | -Release: 14 | 8 | +Release: 15 |
| 9 | Epoch: 1 | 9 | Epoch: 1 |
| 10 | License: GPL+ | 10 | License: GPL+ |
| 11 | Url: http://www.wireshark.org/ | 11 | Url: http://www.wireshark.org/ |
| @@ -45,6 +45,7 @@ Patch26: CVE-2025-11626.patch | |||
| 45 | Patch27: CVE-2025-13946.patch | 45 | Patch27: CVE-2025-13946.patch |
| 46 | Patch28: CVE-2025-13499.patch | 46 | Patch28: CVE-2025-13499.patch |
| 47 | Patch29: CVE-2026-9759.patch | 47 | Patch29: CVE-2026-9759.patch |
| 48 | +Patch30: CVE-2026-76926.patch | ||
| 48 | 49 | ||
| 49 | Requires: xdg-utils | 50 | Requires: xdg-utils |
| 50 | Requires: hicolor-icon-theme | 51 | Requires: hicolor-icon-theme |
| @@ -218,6 +219,12 @@ exit 0 | |||
| 218 | %{_mandir}/man?/* | 219 | %{_mandir}/man?/* |
| 219 | 220 | ||
| 220 | %changelog | 221 | %changelog |
| 222 | +* Wed Aug 19 2026 hanjinpeng <hanjinpeng@kylinos.cn> - 1:3.6.14-15 | ||
| 223 | +- Type:CVE | ||
| 224 | +- ID:CVE-2026-76926 | ||
| 225 | +- SUG:NA | ||
| 226 | +- DESC:fix CVE-2026-76926: busmaster parser should report a malformed file instead of exiting the process | ||
| 227 | + | ||
| 221 | * Thu May 28 2026 wangkai <13474090681@163.com> - 1:3.6.14-14 | 228 | * Thu May 28 2026 wangkai <13474090681@163.com> - 1:3.6.14-14 |
| 222 | - Fix CVE-2026-9759 | 229 | - Fix CVE-2026-9759 |
| 223 | 230 | ||