Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cee6d38c authored by tintin's avatar tintin Committed by android-build-merger
Browse files

libnetutil: Check dhcp respose packet length

am: 61f25d4a

Change-Id: Id5158c66d2ade871c90a2337fe867f977cefdca3
parents e1257bad 61f25d4a
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -218,6 +218,20 @@ int receive_packet(int s, struct dhcp_msg *msg)
     * to construct the pseudo header used in the checksum calculation.
     */
    dhcp_size = ntohs(packet.udp.len) - sizeof(packet.udp);
    /*
     * check validity of dhcp_size.
     * 1) cannot be negative or zero.
     * 2) src buffer contains enough bytes to copy
     * 3) cannot exceed destination buffer
     */
    if ((dhcp_size <= 0) ||
        ((int)(nread - sizeof(struct iphdr) - sizeof(struct udphdr)) < dhcp_size) ||
        ((int)sizeof(struct dhcp_msg) < dhcp_size)) {
#if VERBOSE
        ALOGD("Malformed Packet");
#endif
        return -1;
    }
    saddr = packet.ip.saddr;
    daddr = packet.ip.daddr;
    nread = ntohs(packet.ip.tot_len);