mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/mdns_fuzz_nullderef' into 'master' 

mdns: Fix potential null dereference identified by fuzzer tests

See merge request espressif/esp-idf!15108
pull/7680/head
David Čermák 2021-10-07 15:52:01 +00:00
rodzic bb15aa48a0 2a2b95b9c2
commit 9711e8e0aa
2 zmienionych plików z 8 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
components/mdns/mdns.c
Wyświetl plik

@ -1,16 +1,8 @@
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "mdns.h"
#include "mdns_private.h"
@ -2775,7 +2767,8 @@ static bool _mdns_question_matches(mdns_parsed_question_t * question, uint16_t t
}
} else if (service && (type == MDNS_TYPE_SRV || type == MDNS_TYPE_TXT)) {
const char * name = _mdns_get_service_instance_name(service->service);
if (name && question->host && !strcasecmp(name, question->host)
if (name && question->host && question->service && question->proto && question->domain
&& !strcasecmp(name, question->host)
&& !strcasecmp(service->service->service, question->service)
&& !strcasecmp(service->service->proto, question->proto)
&& !strcasecmp(MDNS_DEFAULT_DOMAIN, question->domain)) {
@ -3237,7 +3230,7 @@ void mdns_parse_packet(mdns_rx_packet_t * packet)
} else if (service) { // only detect srv collision if service existed
col = _mdns_check_srv_collision(service->service, priority, weight, port, name->host, name->domain);
}
if (col && (parsed_packet->probe || parsed_packet->authoritative)) {
if (service && col && (parsed_packet->probe || parsed_packet->authoritative)) {
if (col > 0 || !port) {
do_not_reply = true;
if (_mdns_server->interfaces[packet->tcpip_if].pcbs[packet->ip_protocol].probe_running) {

1
tools/ci/check_copyright_ignore.txt
Wyświetl plik

@ -1983,7 +1983,6 @@ components/mdns/host_test/components/freertos_linux/queue_unique_ptr.hpp
components/mdns/host_test/main/main.c
components/mdns/include/mdns.h
components/mdns/include/mdns_console.h
components/mdns/mdns.c
components/mdns/mdns_console.c
components/mdns/mdns_networking_lwip.c
components/mdns/mdns_networking_socket.c