From e7273c46ecbce8874ce2590040f31be3300ffe38 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Fri, 24 Jan 2025 15:20:11 +0100 Subject: [PATCH 1/2] fix(mdns): Fix potential NULL deref when sending sub-buy Closes coverity reported issue: 473829 Dereference null return value --- components/mdns/mdns.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/mdns/mdns.c b/components/mdns/mdns.c index f5f12cc136..12539a4352 100644 --- a/components/mdns/mdns.c +++ b/components/mdns/mdns.c @@ -2399,6 +2399,9 @@ static void _mdns_send_bye_subtype(mdns_srv_item_t *service, const char *instanc for (j = 0; j < MDNS_IP_PROTOCOL_MAX; j++) { if (mdns_is_netif_ready(i, j)) { mdns_tx_packet_t *packet = _mdns_alloc_packet_default((mdns_if_t)i, (mdns_ip_protocol_t)j); + if (packet == NULL) { + return; + } packet->flags = MDNS_FLAGS_QR_AUTHORITATIVE; if (!_mdns_alloc_answer(&packet->answers, MDNS_TYPE_PTR, service->service, NULL, true, true)) { _mdns_free_tx_packet(packet); From 84c47c37f15bf0b2b92eef99d8359979e2c44edf Mon Sep 17 00:00:00 2001 From: David Cermak Date: Tue, 28 Jan 2025 09:54:54 +0100 Subject: [PATCH 2/2] bump(mdns): 1.5.1 -> 1.5.2 1.5.2 Bug Fixes - Fix potential NULL deref when sending sub-buy (e7273c46) - Fix _mdns_append_fqdn excessive stack usage (bd23c233) --- components/mdns/.cz.yaml | 2 +- components/mdns/CHANGELOG.md | 7 +++++++ components/mdns/idf_component.yml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/components/mdns/.cz.yaml b/components/mdns/.cz.yaml index 3eb7ee67cb..3ec98354e1 100644 --- a/components/mdns/.cz.yaml +++ b/components/mdns/.cz.yaml @@ -3,6 +3,6 @@ commitizen: bump_message: 'bump(mdns): $current_version -> $new_version' pre_bump_hooks: python ../../ci/changelog.py mdns tag_format: mdns-v$version - version: 1.5.1 + version: 1.5.2 version_files: - idf_component.yml diff --git a/components/mdns/CHANGELOG.md b/components/mdns/CHANGELOG.md index 321e488ff9..1522ca3725 100644 --- a/components/mdns/CHANGELOG.md +++ b/components/mdns/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.5.2](https://github.com/espressif/esp-protocols/commits/mdns-v1.5.2) + +### Bug Fixes + +- Fix potential NULL deref when sending sub-buy ([e7273c46](https://github.com/espressif/esp-protocols/commit/e7273c46)) +- Fix _mdns_append_fqdn excessive stack usage ([bd23c233](https://github.com/espressif/esp-protocols/commit/bd23c233)) + ## [1.5.1](https://github.com/espressif/esp-protocols/commits/mdns-v1.5.1) ### Bug Fixes diff --git a/components/mdns/idf_component.yml b/components/mdns/idf_component.yml index d4127e80d4..ea4e511a90 100644 --- a/components/mdns/idf_component.yml +++ b/components/mdns/idf_component.yml @@ -1,4 +1,4 @@ -version: "1.5.1" +version: "1.5.2" description: "Multicast UDP service used to provide local network service and host discovery." url: "https://github.com/espressif/esp-protocols/tree/master/components/mdns" issues: "https://github.com/espressif/esp-protocols/issues"