From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1XW6s6-0002GH-5A for mharc-grub-devel@gnu.org; Mon, 22 Sep 2014 12:53:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XW6rw-00023l-1k for grub-devel@gnu.org; Mon, 22 Sep 2014 12:53:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XW6rm-0005zC-Vb for grub-devel@gnu.org; Mon, 22 Sep 2014 12:53:43 -0400 Received: from mail-la0-x230.google.com ([2a00:1450:4010:c03::230]:58756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XW6rm-0005yi-NF for grub-devel@gnu.org; Mon, 22 Sep 2014 12:53:34 -0400 Received: by mail-la0-f48.google.com with SMTP id ty20so7188095lab.35 for ; Mon, 22 Sep 2014 09:53:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-type :content-transfer-encoding; bh=ZP/xgcPNbvfndhMlBkX+934UO2h+fz9IONLqeDUZBiI=; b=K7uGepAlnlfVWpkyQTP26PIsqkXLAS41wt5dX2jFzWtfHyDZNDis8PhUAeilpmkhE6 gCd1de4Y7BZMUMaC9OZJh4OOcX2UaZscLE4MJb240v9N9/Ld4dI3UnumrFsOZMgiZhaA K97aleqtFx4shUtQNlfQyBnxqGwD3SykeqdWA/sshvgWEJQrb4N6BDhOsLFL0Cas2VbL ymVYpIm75Uv+E4cICZr0birfIJnfFef8ClAa2WjhWtn/+jygAfGF0vkX2R9ddy6lpTRL zICbNQaxK074JM+BRkHp06hbS2WBQRGFuNMceqiMT2xvdAybDGlN/r+xo7J9CQcD52Na XrZA== X-Received: by 10.152.21.168 with SMTP id w8mr27474412lae.59.1411404808212; Mon, 22 Sep 2014 09:53:28 -0700 (PDT) Received: from opensuse.site (ppp94-29-94-89.pppoe.spdop.ru. [94.29.94.89]) by mx.google.com with ESMTPSA id a9sm3929275laa.3.2014.09.22.09.53.26 for (version=SSLv3 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Sep 2014 09:53:27 -0700 (PDT) Date: Mon, 22 Sep 2014 20:53:25 +0400 From: Andrei Borzenkov To: grub-devel@gnu.org Subject: DNS endianness Message-ID: <20140922205325.132df618@opensuse.site> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.23; x86_64-suse-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::230 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Sep 2014 16:53:53 -0000 This does not sound right ... static grub_err_t recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), struct grub_net_buff *nb, void *data_) { ... head = (struct dns_header *) nb->data; ... for (i = 0; i < grub_cpu_to_be16 (head->qdcount); i++) { We sure want to convert *to* cpu, not *from* cpu here? Same in all other places in this function. Do I miss something obvious here? Or how about patch below? diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c index 0b771fb..9d0c8fc 100644 --- a/grub-core/net/dns.c +++ b/grub-core/net/dns.c @@ -262,7 +262,7 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), grub_netbuff_free (nb); return GRUB_ERR_NONE; } - for (i = 0; i < grub_cpu_to_be16 (head->qdcount); i++) + for (i = 0; i < grub_be_to_cpu16 (head->qdcount); i++) { if (ptr >= nb->tail) { @@ -277,7 +277,7 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), ptr += 4; } *data->addresses = grub_malloc (sizeof ((*data->addresses)[0]) - * grub_cpu_to_be16 (head->ancount)); + * grub_be_to_cpu16 (head->ancount)); if (!*data->addresses) { grub_errno = GRUB_ERR_NONE; @@ -286,7 +286,7 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), } reparse_ptr = ptr; reparse: - for (i = 0, ptr = reparse_ptr; i < grub_cpu_to_be16 (head->ancount); i++) + for (i = 0, ptr = reparse_ptr; i < grub_be_to_cpu16 (head->ancount); i++) { int ignored = 0; grub_uint8_t class;