From patchwork Tue Oct 27 02:28:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangbin Liu X-Patchwork-Id: 288087 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6AD0C2D0A3 for ; Tue, 27 Oct 2020 02:29:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 66EAD2151B for ; Tue, 27 Oct 2020 02:29:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Fvk1+Rop" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2409427AbgJ0C3F (ORCPT ); Mon, 26 Oct 2020 22:29:05 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:37265 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729249AbgJ0C3E (ORCPT ); Mon, 26 Oct 2020 22:29:04 -0400 Received: by mail-pl1-f193.google.com with SMTP id b12so3330310plr.4 for ; Mon, 26 Oct 2020 19:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hxGRlL5LeTHpC2PaGOKhYJ+cD81YRHfTwaT5dBtJdNc=; b=Fvk1+RopT4bt9psNDCRLQkVIPcgAzMnBEsXEUBiWC3WZnTXBrnP0jG+rz4ILPNwOg4 mB/d5TSVq5P1D9mkCP8FL0cPm6svfmU8DLMpvQN6WR5tpWG1xdzDzNp3kU6AtI1/B8Pk vQ2OsRngpWhw+gL5aWxFGoLtoNzPh1IerCN4UrqK2Tjo1WmbWpMHxeaxLZ/pUfj2Mwjr bMRLKntQhrSa4k68viEFvfA6xzLdB3YgCGIRkNYYFfl+Rm/IULt8CZZlSua8hnl5elwC KBrGFw7ic70RvVId+IHyerax0S3+K3H64v6WxbDjgGji/zX7jpQTVgOB61JY+aXxPGrs 7BQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hxGRlL5LeTHpC2PaGOKhYJ+cD81YRHfTwaT5dBtJdNc=; b=lTgjs0HfPOHCuvsLBL8xbhlhtFT+jXwXnb4L7EXvAU6S2yg788sbZnAQisiD7IYGi6 WLTRBGfZYG0s39RVolgZRc1hQi3D8uIkxkL70Ap4SGeIvanQ9BP3yL+NL9rnByYxw3dF cKyFB8jx1NZHMaGKp2Io1+ID67L5Jl+cfBMsOiA4Mxe2bzD/c86vpy3N0pwMFvdrMNdT JPHBvUgMFwAYoIn2q+MxLkJqi78XqaaoKcBOa6br9w/KaDJCUgVyf0T/urd2n/8ULTzH XSDgiaL7z1PVKDP/azvv/JIYwH+RFk2wY3aam3IknmTsLJWKiwKbgvOuO7q0JSnqPJJV PLHA== X-Gm-Message-State: AOAM531SQYEVHf5tqccDowWraELoFFR/Xv9mo7rQ51JmP5uQcFYPpdtc D8+ZD7WevSM1pxv3122oL/CPEvs7nGHXCiZ8 X-Google-Smtp-Source: ABdhPJyOI/kgscYYGtYpa3ja3ucYcBdnlUfs7RJK50KOpqTYd8kWSxCOlMUmYIVsZLZGMLAi+qRzvg== X-Received: by 2002:a17:902:a50a:b029:d4:da2d:c9a1 with SMTP id s10-20020a170902a50ab02900d4da2dc9a1mr212425plq.6.1603765743659; Mon, 26 Oct 2020 19:29:03 -0700 (PDT) Received: from localhost.localdomain.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id o10sm5066131pgp.16.2020.10.26.19.29.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 19:29:03 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Alexey Kuznetsov , Hideaki YOSHIFUJI , Jakub Kicinski , Willem de Bruijn , "David S . Miller" , Eric Dumazet , Georg Kohmann , Hangbin Liu Subject: [PATCHv5 net 1/2] ICMPv6: Add ICMPv6 Parameter Problem, code 3 definition Date: Tue, 27 Oct 2020 10:28:32 +0800 Message-Id: <20201027022833.3697522-2-liuhangbin@gmail.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20201027022833.3697522-1-liuhangbin@gmail.com> References: <20201026072926.3663480-1-liuhangbin@gmail.com> <20201027022833.3697522-1-liuhangbin@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Based on RFC7112, Section 6: IANA has added the following "Type 4 - Parameter Problem" message to the "Internet Control Message Protocol version 6 (ICMPv6) Parameters" registry: CODE NAME/DESCRIPTION 3 IPv6 First Fragment has incomplete IPv6 Header Chain Signed-off-by: Hangbin Liu --- include/uapi/linux/icmpv6.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/icmpv6.h b/include/uapi/linux/icmpv6.h index c1661febc2dc..0564fd7ccde4 100644 --- a/include/uapi/linux/icmpv6.h +++ b/include/uapi/linux/icmpv6.h @@ -138,6 +138,7 @@ struct icmp6hdr { #define ICMPV6_HDR_FIELD 0 #define ICMPV6_UNK_NEXTHDR 1 #define ICMPV6_UNK_OPTION 2 +#define ICMPV6_HDR_INCOMP 3 /* * constants for (set|get)sockopt From patchwork Tue Oct 27 12:33:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangbin Liu X-Patchwork-Id: 288062 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFEF2C388F9 for ; Tue, 27 Oct 2020 12:33:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B6D421D24 for ; Tue, 27 Oct 2020 12:33:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="F3QRebhe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751306AbgJ0Mdm (ORCPT ); Tue, 27 Oct 2020 08:33:42 -0400 Received: from mail-pl1-f181.google.com ([209.85.214.181]:45420 "EHLO mail-pl1-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409439AbgJ0Mdm (ORCPT ); Tue, 27 Oct 2020 08:33:42 -0400 Received: by mail-pl1-f181.google.com with SMTP id v22so666154ply.12 for ; Tue, 27 Oct 2020 05:33:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bFEjBfyvj8SMVTCu9Bj3WXHrUwR1qUn3C1u+lijdykc=; b=F3QRebhe/CFaaw2cMIhi93EWXszJtQky414Z/Y8MkVCzqN3eK6vewSjCXf8s+a1htL ZUMi2cR/qD3sWHuHIfR8zOdz1cqdbHTOINrszonOvLULC7Zt2HK5/E+sBxNLlaLo9ZUJ SiOOzJyOKTrcgNnZ+j/X80I1jQ9EowSh9SmnS5NSd5M8765ACBEdpJN788SVXz0UDdbh 7IyhENsvCTTsYymsQQzWPg4d7/EUrQ2VwmUSAurBgWjq9SHle0UtGXAd1QzFgSwMzLMq +XtmBBT06hoHpNi4DgauAv2T0W5Mwqu6P4SBDzUILPIMBiwSIeseLdyh9VFSSkAHvmA/ gPJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bFEjBfyvj8SMVTCu9Bj3WXHrUwR1qUn3C1u+lijdykc=; b=Qcv8S+rX9AFm/rEPilbf/3ty7cmN5hGB30YgA9JoX6tJYRr42EY20d8d/aHEPfOEdi 2CSfxmsGuVxj+BDkCS99OBF+FosHtzguaCVtnBSAz1ZjLNlp9z3XSaO5OA+se+E+cbgD wz6xvlH6sJ6HDTY1qpM+WT6wQJb5lmkhtpq33llYHIV3fFHpi4S12Z0HzvrF3uDH+NHZ 5ZtCoazDKNj8uZWtxXG6KNhMGXICHGsvOpQ85aaDLr8oozETaqh2/uTTs4cEnJ8+CNVu 1swbGd9Xzs6gRzkK4nQztxDBvAxWI8jrcxg7mWqHcSeV9D6xbqOsyotqkUijZfoHQrrN FARQ== X-Gm-Message-State: AOAM533OpSVgay/dbPECuO+ZU120pCsC8fg07kOk8luBt+anY6yUCz0o ZiXnREpMjDCVeGmDXldnK1WR1rGak3RxPVw0 X-Google-Smtp-Source: ABdhPJwCetVQVTMyR5ULoQQuQwCSubxdgUQ8nVtViSJVS01bCRcRlack3wJTiERtBJDKbvZEdYUnaA== X-Received: by 2002:a17:90a:4549:: with SMTP id r9mr1928089pjm.146.1603802021448; Tue, 27 Oct 2020 05:33:41 -0700 (PDT) Received: from localhost.localdomain.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id q189sm2251231pfc.94.2020.10.27.05.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 05:33:40 -0700 (PDT) From: Hangbin Liu To: netdev@vger.kernel.org Cc: Alexey Kuznetsov , Hideaki YOSHIFUJI , Jakub Kicinski , Willem de Bruijn , "David S . Miller" , Eric Dumazet , Georg Kohmann , Hangbin Liu Subject: [PATCHv6 net 2/2] IPv6: reply ICMP error if the first fragment don't include all headers Date: Tue, 27 Oct 2020 20:33:13 +0800 Message-Id: <20201027123313.3717941-3-liuhangbin@gmail.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20201027123313.3717941-1-liuhangbin@gmail.com> References: <20201027022833.3697522-1-liuhangbin@gmail.com> <20201027123313.3717941-1-liuhangbin@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Based on RFC 8200, Section 4.5 Fragment Header: - If the first fragment does not include all headers through an Upper-Layer header, then that fragment should be discarded and an ICMP Parameter Problem, Code 3, message should be sent to the source of the fragment, with the Pointer field set to zero. Checking each packet header in IPv6 fast path will have performance impact, so I put the checking in ipv6_frag_rcv(). As the packet may be any kind of L4 protocol, I only checked some common protocols' header length and handle others by (offset + 1) > skb->len. Also use !(frag_off & htons(IP6_OFFSET)) to catch atomic fragments (fragmented packet with only one fragment). When send ICMP error message, if the 1st truncated fragment is ICMP message, icmp6_send() will break as is_ineligible() return true. So I added a check in is_ineligible() to let fragment packet with nexthdr ICMP but no ICMP header return false. Signed-off-by: Hangbin Liu --- v6: Use !(frag_off & htons(IP6_OFFSET)) to catch atomic fragments v5: Only check nexthdr if ipv6_skip_exthdr() does not return -1. For IPPROTO_NONE/NEXTHDR_NONE, later code will handle and ignore it. v4: remove unused variable v3: a) use frag_off to check if this is a fragment packet b) check some common protocols' header length v2: a) Move header check to ipv6_frag_rcv(). Also check the ipv6_skip_exthdr() return value b) Fix ipv6_find_hdr() parameter type miss match in is_ineligible() --- net/ipv6/icmp.c | 8 +++++++- net/ipv6/reassembly.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index ec448b71bf9a..8956144ea65e 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -158,7 +158,13 @@ static bool is_ineligible(const struct sk_buff *skb) tp = skb_header_pointer(skb, ptr+offsetof(struct icmp6hdr, icmp6_type), sizeof(_type), &_type); - if (!tp || !(*tp & ICMPV6_INFOMSG_MASK)) + + /* Based on RFC 8200, Section 4.5 Fragment Header, return + * false if this is a fragment packet with no icmp header info. + */ + if (!tp && frag_off != 0) + return false; + else if (!tp || !(*tp & ICMPV6_INFOMSG_MASK)) return true; } return false; diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 1f5d4d196dcc..c8cf1bbad74a 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -42,6 +42,8 @@ #include #include #include +#include +#include #include #include @@ -322,7 +324,9 @@ static int ipv6_frag_rcv(struct sk_buff *skb) struct frag_queue *fq; const struct ipv6hdr *hdr = ipv6_hdr(skb); struct net *net = dev_net(skb_dst(skb)->dev); - int iif; + __be16 frag_off; + int iif, offset; + u8 nexthdr; if (IP6CB(skb)->flags & IP6SKB_FRAGMENTED) goto fail_hdr; @@ -351,6 +355,33 @@ static int ipv6_frag_rcv(struct sk_buff *skb) return 1; } + /* RFC 8200, Section 4.5 Fragment Header: + * If the first fragment does not include all headers through an + * Upper-Layer header, then that fragment should be discarded and + * an ICMP Parameter Problem, Code 3, message should be sent to + * the source of the fragment, with the Pointer field set to zero. + */ + nexthdr = hdr->nexthdr; + offset = ipv6_skip_exthdr(skb, skb_transport_offset(skb), &nexthdr, &frag_off); + if (offset >= 0) { + /* Check some common protocols' header */ + if (nexthdr == IPPROTO_TCP) + offset += sizeof(struct tcphdr); + else if (nexthdr == IPPROTO_UDP) + offset += sizeof(struct udphdr); + else if (nexthdr == IPPROTO_ICMPV6) + offset += sizeof(struct icmp6hdr); + else + offset += 1; + + if (!(frag_off & htons(IP6_OFFSET)) && offset > skb->len) { + __IP6_INC_STATS(net, __in6_dev_get_safely(skb->dev), + IPSTATS_MIB_INHDRERRORS); + icmpv6_param_prob(skb, ICMPV6_HDR_INCOMP, 0); + return -1; + } + } + iif = skb->dev ? skb->dev->ifindex : 0; fq = fq_find(net, fhdr->identification, hdr, iif); if (fq) {