Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1psM70-0006nr-Lh for mharc-grub-devel@gnu.org; Fri, 28 Apr 2023 07:18:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psM6z-0006nj-Cx for grub-devel@gnu.org; Fri, 28 Apr 2023 07:18:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psM6x-0000nS-Me for grub-devel@gnu.org; Fri, 28 Apr 2023 07:18:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682680678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MlpSbFr6TKbiGlt59Yt9zloht/cZ2MvLDR2eqjDLACc=; b=G1K6fWib+qc0EFqTgK0RVDVsvMZdAz9MzwgBXabrJd0TqF+BaQ8pVTjGqlWzDAhLEikU94 CKdNtr6ptHpIitEnS8pgTze8qo+Bv+X819Admfo9j0IfXpiYhMu+7ogoJcgfk8dRHayyrw li7uv0A1urtfIREHoPsZPNDr95EKzBU= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-1-6v-QzrL0P9Gyc6JQjLMqTw-1; Fri, 28 Apr 2023 07:17:55 -0400 X-MC-Unique: 6v-QzrL0P9Gyc6JQjLMqTw-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3f25376e3b1so20902255e9.1 for ; Fri, 28 Apr 2023 04:17:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682680674; x=1685272674; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MlpSbFr6TKbiGlt59Yt9zloht/cZ2MvLDR2eqjDLACc=; b=fu+fwyB8D7MeqKvIL5eSy2cmV0pFj/l8tuLQXpIrVVTDV+6OPHLsdpD1CowK72IREp /nREdzY/tuF4/lk/b+3HOLtaHwM/6TtfkOFKOSW9rra8A7iP+Ju9c/oVOF5OlPfuvc7t lzqAJVYQYhYw8t0oEMLYPxnBTjArUntV/5sEAR+fh42b7I4UGfLKozBP4Zjmfj340FX9 C/NjmHzvsa68Ie92fzXz5epLBxEhT61SuiHx8LiGXM4taPd/Vf6pwIReutiQV1zxK5pz xXRwUGjGGkx9vl6++EJM1LwgPBtKNR101Vw32eXNo8Vhvc8bpa4RRjUeyHwaXqgitjbj TsHg== X-Gm-Message-State: AC+VfDyhOSQrkgTjV6Epx8ezbCRlxSNQiliboNg0rCC2r4/N4DyD3I9A 4vfbZ6rRKul/r2Z1Z6M6ZQk+CWJTF7XOq4+mHmheNalnwO0r9geCGLtQM97AteT5CRs7XIO7uj6 LjcU3dkgsOxVDcd/V37GU/D6k3XIP9fSQ1FxeNKHVbZ7mjshn1tmshIh+tOWG6HqwuaDaFtM= X-Received: by 2002:a7b:c446:0:b0:3ee:6d55:8b73 with SMTP id l6-20020a7bc446000000b003ee6d558b73mr3567856wmi.29.1682680673864; Fri, 28 Apr 2023 04:17:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6YiJTp+yxrnJ5P+6E+ejKsCFX3+KcwZ7uXurIFEBwZq4pDRGXBwWPoSBA1ac4ZaEb8BZ1+FQ== X-Received: by 2002:a7b:c446:0:b0:3ee:6d55:8b73 with SMTP id l6-20020a7bc446000000b003ee6d558b73mr3567836wmi.29.1682680673462; Fri, 28 Apr 2023 04:17:53 -0700 (PDT) Received: from p1.redhat.com (ip-62-129-184-28.evc.net. [62.129.184.28]) by smtp.gmail.com with ESMTPSA id k36-20020a05600c1ca400b003f1733feb3dsm27936402wms.0.2023.04.28.04.17.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 04:17:53 -0700 (PDT) From: =?UTF-8?q?Renaud=20M=C3=A9trich?= To: grub-devel@gnu.org Cc: =?UTF-8?q?Renaud=20M=C3=A9trich?= , dkiper@net-space.pl Subject: [PATCH v1] dns: fixed lookup error when no IPv6 is returned Date: Fri, 28 Apr 2023 13:17:44 +0200 Message-Id: <20230428111744.231015-1-rmetrich@redhat.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=rmetrich@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Apr 2023 11:18:01 -0000 When trying to resolve DNS names into IP addresses, the DNS code fails from time to time with the following error: -------- 8< ---------------- 8< ---------------- 8< ---------------- 8< -------- error: ../../grub-core/net/dns.c:688:no DNS record found. -------- 8< ---------------- 8< ---------------- 8< ---------------- 8< -------- This happens when both IPv4 and IPv6 queries are performed against the DNS server (e.g. 8.8.8.8) but there is no IP returned for IPv6 query, as shown below: -------- 8< ---------------- 8< ---------------- 8< ---------------- 8< -------- grub> net_del_dns 192.168.122.1 grub> net_add_dns 8.8.8.8 grub> net_nslookup ipv4.test-ipv6.com error: ../../grub-core/net/dns.c:688:no DNS record found. grub> net_nslookup ipv4.test-ipv6.com 216.218.228.115 -------- 8< ---------------- 8< ---------------- 8< ---------------- 8< -------- The root cause is the code exiting prematurely when the data->addresses buffer has been allocated in recv_hook(), even if there was no address returned last time recv_hook() executed. This patch additionally simplifies the error handling. Signed-off-by: Renaud Métrich --- grub-core/net/dns.c | 69 +++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c index afa389494..2dfb98d98 100644 --- a/grub-core/net/dns.c +++ b/grub-core/net/dns.c @@ -261,43 +261,27 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), /* Code apparently assumed that only one packet is received as response. We may get multiple responses due to network condition, so check here and quit early. */ - if (*data->addresses) - { - grub_netbuff_free (nb); - return GRUB_ERR_NONE; - } + if (*data->naddresses) + goto out; head = (struct dns_header *) nb->data; ptr = (grub_uint8_t *) (head + 1); if (ptr >= nb->tail) - { - grub_netbuff_free (nb); - return GRUB_ERR_NONE; - } + goto out; if (head->id != data->id) - { - grub_netbuff_free (nb); - return GRUB_ERR_NONE; - } + goto out; if (!(head->flags & FLAGS_RESPONSE) || (head->flags & FLAGS_OPCODE)) - { - grub_netbuff_free (nb); - return GRUB_ERR_NONE; - } + goto out; if (head->ra_z_r_code & ERRCODE_MASK) { data->dns_err = 1; - grub_netbuff_free (nb); - return GRUB_ERR_NONE; + goto out; } for (i = 0; i < grub_be_to_cpu16 (head->qdcount); i++) { if (ptr >= nb->tail) - { - grub_netbuff_free (nb); - return GRUB_ERR_NONE; - } + goto out; while (ptr < nb->tail && !((*ptr & 0xc0) || *ptr == 0)) ptr += *ptr + 1; if (ptr < nb->tail && (*ptr & 0xc0)) @@ -310,8 +294,7 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), if (!*data->addresses) { grub_errno = GRUB_ERR_NONE; - grub_netbuff_free (nb); - return GRUB_ERR_NONE; + goto out; } reparse_ptr = ptr; reparse: @@ -322,11 +305,7 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), grub_uint32_t ttl = 0; grub_uint16_t length; if (ptr >= nb->tail) - { - if (!*data->naddresses) - grub_free (*data->addresses); - return GRUB_ERR_NONE; - } + goto out; ignored = !check_name (ptr, nb->data, nb->tail, data->name); while (ptr < nb->tail && !((*ptr & 0xc0) || *ptr == 0)) ptr += *ptr + 1; @@ -334,12 +313,7 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), ptr++; ptr++; if (ptr + 10 >= nb->tail) - { - if (!*data->naddresses) - grub_free (*data->addresses); - grub_netbuff_free (nb); - return GRUB_ERR_NONE; - } + goto out; if (*ptr++ != 0) ignored = 1; class = *ptr++; @@ -355,12 +329,7 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), length = *ptr++ << 8; length |= *ptr++; if (ptr + length > nb->tail) - { - if (!*data->naddresses) - grub_free (*data->addresses); - grub_netbuff_free (nb); - return GRUB_ERR_NONE; - } + goto out; if (!ignored) { if (ttl_all > ttl) @@ -374,6 +343,7 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4; grub_memcpy (&(*data->addresses)[*data->naddresses].ipv4, ptr, 4); + grub_dprintf ("dns", "got A 0x%x\n", (*data->addresses)[*data->naddresses].ipv4); (*data->naddresses)++; data->stop = 1; break; @@ -384,6 +354,10 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6; grub_memcpy (&(*data->addresses)[*data->naddresses].ipv6, ptr, 16); + grub_dprintf ("dns", "got AAAA 0x%lx%lx\n", + (*data->addresses)[*data->naddresses].ipv6[0], + (*data->addresses)[*data->naddresses].ipv6[1] + ); (*data->naddresses)++; data->stop = 1; break; @@ -400,15 +374,14 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), if (!data->name) { data->dns_err = 1; - grub_errno = 0; - return GRUB_ERR_NONE; + grub_errno = GRUB_ERR_NONE; + goto out; } grub_dprintf ("dns", "CNAME %s\n", data->name); if (grub_strcmp (redirect_save, data->name) == 0) { data->dns_err = 1; - grub_free (redirect_save); - return GRUB_ERR_NONE; + goto out; } goto reparse; } @@ -440,8 +413,12 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), *data->naddresses * sizeof (dns_cache[h].addresses[0])); } + + out: grub_netbuff_free (nb); grub_free (redirect_save); + if (!*data->naddresses) + grub_free (*data->addresses); return GRUB_ERR_NONE; } -- 2.40.0