]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
net: emaclite: fix handling for IP packets with specific lengths
authorSamuel Obuch <samuel.obuch@codasip.com>
Tue, 27 Sep 2022 11:21:03 +0000 (13:21 +0200)
committerMichal Simek <michal.simek@amd.com>
Wed, 5 Oct 2022 09:36:54 +0000 (11:36 +0200)
The maximum length is capped similarly to the emaclite_send function.
Avoid integer underflow for values of ip->ip_len < 30, the minimum
length of an IP packet is 21 bytes.

Signed-off-by: Samuel Obuch <samuel.obuch@codasip.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Link: https://lore.kernel.org/r/20220927112103.155689-3-samuel.obuch@codasip.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
drivers/net/xilinx_emaclite.c

index a4851ad36f765a9e5d3d9e70826cb5efe4c22d01..16ba915fbaafa6c3ac738b85873a5af9971dd5b0 100644 (file)
@@ -517,6 +517,8 @@ try_again:
                length = ntohs(ip->ip_len);
                length += ETHER_HDR_SIZE + ETH_FCS_LEN;
                debug("IP Packet %x\n", length);
+               if (length > PKTSIZE)
+                       length = PKTSIZE;
                break;
        default:
                debug("Other Packet\n");
@@ -525,7 +527,7 @@ try_again:
        }
 
        /* Read the rest of the packet which is longer then first read */
-       if (length != first_read)
+       if (length > first_read)
                xemaclite_alignedread(addr + first_read,
                                      etherrxbuff + first_read,
                                      length - first_read);