efi_loader: fill return values in SimpleNetworkProtocol

In the receive function all return values should be filled.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Alexander Graf <agraf@suse.de>

diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c
index 4546b436031d1cdd001d1bd7c72b40f5950dd70e..432d9a99a2bf5393009064297e7bc18b3690f75e 100644 (file)
--- a/lib/efi_loader/efi_net.c
+++ b/lib/efi_loader/efi_net.c
@@ -204,6 +204,10 @@ static efi_status_t EFIAPI efi_net_receive(struct efi_simple_network *this,
                struct efi_mac_address *src_addr,
                struct efi_mac_address *dest_addr, u16 *protocol)
 {
+       struct ethernet_hdr *eth_hdr;
+       size_t hdr_size = sizeof(struct ethernet_hdr);
+       u16 protlen;
+
        EFI_ENTRY("%p, %p, %p, %p, %p, %p, %p", this, header_size,
                  buffer_size, buffer, src_addr, dest_addr, protocol);
 
@@ -211,13 +215,32 @@ static efi_status_t EFIAPI efi_net_receive(struct efi_simple_network *this,
 
        if (!new_rx_packet)
                return EFI_EXIT(EFI_NOT_READY);
-
+       /* Check that we at least received an Ethernet header */
+       if (net_rx_packet_len < sizeof(struct ethernet_hdr)) {
+               new_rx_packet = false;
+               return EFI_EXIT(EFI_NOT_READY);
+       }
+       /* Fill export parameters */
+       eth_hdr = (struct ethernet_hdr *)net_rx_packet;
+       protlen = ntohs(eth_hdr->et_protlen);
+       if (protlen == 0x8100) {
+               hdr_size += 4;
+               protlen = ntohs(*(u16 *)&net_rx_packet[hdr_size - 2]);
+       }
+       if (header_size)
+               *header_size = hdr_size;
+       if (dest_addr)
+               memcpy(dest_addr, eth_hdr->et_dest, ARP_HLEN);
+       if (src_addr)
+               memcpy(src_addr, eth_hdr->et_src, ARP_HLEN);
+       if (protocol)
+               *protocol = protlen;
        if (*buffer_size < net_rx_packet_len) {
                /* Packet doesn't fit, try again with bigger buf */
                *buffer_size = net_rx_packet_len;
                return EFI_EXIT(EFI_BUFFER_TOO_SMALL);
        }
-
+       /* Copy packet */
        memcpy(buffer, net_rx_packet, net_rx_packet_len);
        *buffer_size = net_rx_packet_len;
        new_rx_packet = false;