Merge branch 'master' into next

diff --cc grub-core/net/arp.c
index c250dcfd5c6998c2ed4e3ca51dad85d539c2dabd,4b68c4151a11db214602f74e111e7552801d8450..54306e3b16d25fe5d3bdf9502683822237be488d
--- 1/grub-core/net/arp.c
--- 2/grub-core/net/arp.c
+++ b/grub-core/net/arp.c
@@@ -122,74 -111,70 +111,78 @@@ grub_net_arp_send_request (struct grub_
  }
  
  grub_err_t
 -grub_net_arp_receive (struct grub_net_buff *nb,
 -                    struct grub_net_card *card)
 +grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
 +                      grub_uint16_t *vlantag)
  {
-   struct arphdr *arp_header = (struct arphdr *) nb->data;
-   grub_uint8_t *sender_hardware_address;
-   grub_uint8_t *target_hardware_address;
+   struct arppkt *arp_packet = (struct arppkt *) nb->data;
    grub_net_network_level_address_t sender_addr, target_addr;
-   grub_net_link_level_address_t sender_hw_addr;
+   grub_net_link_level_address_t sender_mac_addr;
    struct grub_net_network_level_interface *inf;
-   grub_uint8_t *sender_protocol_address, *target_protocol_address;
- 
-   sender_hardware_address =
-     (grub_uint8_t *) arp_header + sizeof (*arp_header);
-   sender_protocol_address = sender_hardware_address + arp_header->hln;
-   target_hardware_address = sender_protocol_address + arp_header->pln;
-   target_protocol_address = target_hardware_address + arp_header->hln;
-   if (grub_be_to_cpu16 (arp_header->pro) == GRUB_NET_ETHERTYPE_IP
-       && arp_header->pln == 4)
-     {
-       sender_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
-       target_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
-       grub_memcpy (&sender_addr.ipv4, sender_protocol_address, 4);
-       grub_memcpy (&target_addr.ipv4, target_protocol_address, 4);
-       if (grub_memcmp (sender_protocol_address, &pending_req, 4) == 0)
-       have_pending = 1;
-     }
-   else
+ 
+   if (arp_packet->pro != grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP)
+       || arp_packet->pln != 4 || arp_packet->hln != 6
+       || nb->tail - nb->data < (int) sizeof (*arp_packet))
      return GRUB_ERR_NONE;
  
-   sender_hw_addr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
-   grub_memcpy (sender_hw_addr.mac, sender_hardware_address,
-              sizeof (sender_hw_addr.mac));
-   grub_net_link_layer_add_address (card, &sender_addr, &sender_hw_addr, 1);
+   sender_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
+   target_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
+   sender_addr.ipv4 = arp_packet->sender_ip;
+   target_addr.ipv4 = arp_packet->recv_ip;
+   if (arp_packet->sender_ip == pending_req)
+     have_pending = 1;
+ 
+   sender_mac_addr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+   grub_memcpy (sender_mac_addr.mac, arp_packet->sender_mac,
+              sizeof (sender_mac_addr.mac));
+   grub_net_link_layer_add_address (card, &sender_addr, &sender_mac_addr, 1);
  
    FOR_NET_NETWORK_LEVEL_INTERFACES (inf)
    {
 +    /* Verify vlantag id */
 +    if (inf->card == card && inf->vlantag != *vlantag)
 +      {
 +        grub_dprintf ("net", "invalid vlantag! %x != %x\n",
 +                      inf->vlantag, *vlantag);
 +        break;
 +      }
 +
      /* Am I the protocol address target? */
      if (grub_net_addr_cmp (&inf->address, &target_addr) == 0
-       && grub_be_to_cpu16 (arp_header->op) == ARP_REQUEST)
+       && arp_packet->op == grub_cpu_to_be16_compile_time (ARP_REQUEST))
        {
        grub_net_link_level_address_t target;
-       /* We've already checked that pln is either 4 or 16.  */
-       char tmp[16];
-       grub_size_t pln = arp_header->pln;
- 
-       if (pln > 16)
-         pln = 16;
+       struct grub_net_buff nb_reply;
+       struct arppkt *arp_reply;
+       grub_uint8_t arp_data[128];
+       grub_err_t err;
+ 
+       nb_reply.head = arp_data;
+       nb_reply.end = arp_data + sizeof (arp_data);
+       grub_netbuff_clear (&nb_reply);
+       grub_netbuff_reserve (&nb_reply, 128);
+ 
+       err = grub_netbuff_push (&nb_reply, sizeof (*arp_packet));
+       if (err)
+         return err;
+ 
+       arp_reply = (struct arppkt *) nb_reply.data;
+ 
+       arp_reply->hrd = grub_cpu_to_be16_compile_time (GRUB_NET_ARPHRD_ETHERNET);
+       arp_reply->pro = grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP);
+       arp_reply->pln = 4;
+       arp_reply->hln = 6;
+       arp_reply->op = grub_cpu_to_be16_compile_time (ARP_REPLY);
+       arp_reply->sender_ip = arp_packet->recv_ip;
+       arp_reply->recv_ip = arp_packet->sender_ip;
+       arp_reply->hln = 6;
  
        target.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
-       grub_memcpy (target.mac, sender_hardware_address, 6);
-       grub_memcpy (target_hardware_address, target.mac, 6);
-       grub_memcpy (sender_hardware_address, inf->hwaddress.mac, 6);
- 
-       grub_memcpy (tmp, sender_protocol_address, pln);
-       grub_memcpy (sender_protocol_address, target_protocol_address, pln);
-       grub_memcpy (target_protocol_address, tmp, pln);
+       grub_memcpy (target.mac, arp_packet->sender_mac, 6);
+       grub_memcpy (arp_reply->sender_mac, inf->hwaddress.mac, 6);
+       grub_memcpy (arp_reply->recv_mac, arp_packet->sender_mac, 6);
  
        /* Change operation to REPLY and send packet */
-       arp_header->op = grub_be_to_cpu16 (ARP_REPLY);
-       send_ethernet_packet (inf, nb, target, GRUB_NET_ETHERTYPE_ARP);
+       send_ethernet_packet (inf, &nb_reply, target, GRUB_NET_ETHERTYPE_ARP);
        }
    }
    return GRUB_ERR_NONE;

diff --cc grub-core/net/drivers/ieee1275/ofnet.c
index 956d12d6849e984d7fd2122e25556069c84cb05a,6bd3b922e82bf0ee942287ba67c147c037b6dd46..9d83c9f321e1eedc346367b23871dcc07efb18ce
--- 1/grub-core/net/drivers/ieee1275/ofnet.c
--- 2/grub-core/net/drivers/ieee1275/ofnet.c
+++ b/grub-core/net/drivers/ieee1275/ofnet.c
@@@ -150,8 -150,8 +150,8 @@@ grub_ieee1275_parse_bootargs (const cha
    grub_net_network_level_address_t client_addr, gateway_addr, subnet_mask;
    grub_net_link_level_address_t hw_addr;
    grub_net_interface_flags_t flags = 0;
-   struct grub_net_network_level_interface *inter;
+   struct grub_net_network_level_interface *inter = NULL;
 +  grub_uint16_t vlantag = 0;
  
    hw_addr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
  

diff --cc include/grub/net.h
Simple merge