• Xin Long's avatar
    icmp: fix icmp_ext_echo_iio parsing in icmp_build_probe · 1fcd7945
    Xin Long authored
    In icmp_build_probe(), the icmp_ext_echo_iio parsing should be done
    step by step and skb_header_pointer() return value should always be
    checked, this patch fixes 3 places in there:
    
      - On case ICMP_EXT_ECHO_CTYPE_NAME, it should only copy ident.name
        from skb by skb_header_pointer(), its len is ident_len. Besides,
        the return value of skb_header_pointer() should always be checked.
    
      - On case ICMP_EXT_ECHO_CTYPE_INDEX, move ident_len check ahead of
        skb_header_pointer(), and also do the return value check for
        skb_header_pointer().
    
      - On case ICMP_EXT_ECHO_CTYPE_ADDR, before accessing iio->ident.addr.
        ctype3_hdr.addrlen, skb_header_pointer() should be called first,
        then check its return value and ident_len.
        On subcases ICMP_AFI_IP and ICMP_AFI_IP6, also do check for ident.
        addr.ctype3_hdr.addrlen and skb_header_pointer()'s return value.
        On subcase ICMP_AFI_IP, the len for skb_header_pointer() should be
        "sizeof(iio->extobj_hdr) + sizeof(iio->ident.addr.ctype3_hdr) +
        sizeof(struct in_addr)" or "ident_len".
    
    v1->v2:
      - To make it more clear, call skb_header_pointer() once only for
        iio->indent's parsing as Jakub Suggested.
    v2->v3:
      - The extobj_hdr.length check against sizeof(_iio) should be done
        before calling skb_header_pointer(), as Eric noticed.
    
    Fixes: d329ea5b ("icmp: add response to RFC 8335 PROBE messages")
    Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
    Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
    Link: https://lore.kernel.org/r/31628dd76657ea62f5cf78bb55da6b35240831f1.1634205050.git.lucien.xin@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
    1fcd7945
icmp.c 37 KB