From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2E382E62D1 for ; Fri, 23 Jan 2026 21:35:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769204154; cv=none; b=Er26Zb4ATwYC6H3YMNB1w7n70lEHvQlRuMvuuOW4Ona3WxLyQ+tNEbdpSu7NL0OAio1X36YzZih29Pex4csqvwsnenHh4JKwbJQFdT8OZrAKjIMfkB9x4nrEQgCvAolXmDPOZs7tV3uvVfQdWjBNmD6OTgnzj2RKgIFc/I1S1CU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769204154; c=relaxed/simple; bh=uMy3HxjA5hDCgIJblyt6KfZmdEgbS4b57+GnOjEOLvk=; h=Message-ID:Date:MIME-Version:Subject:To:References:From: In-Reply-To:Content-Type; b=unquwsVWB+IYH4jyhpnxorBRls2lb/PporD4O4E0LosZUmsYualKOaAW3sj6ncTXKlkNrik8759vt7OOUte3yewnvGjqQ5pJSbYzmJg/6BTkXJD0ApJi/W4p6ZP6+J3f+VHw9akZV3eG4zaC15avZddmlQ5sc1kdwpOeQpPctW8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RmVtRtT8; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RmVtRtT8" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-480142406b3so18535505e9.1 for ; Fri, 23 Jan 2026 13:35:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769204151; x=1769808951; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=bMClnrU1ojs/oRDsTOTz3+XVnxCCRuf482L0kuY835M=; b=RmVtRtT8gTp1AVCjodCLLGAzTJSwDdOn3pdyhVcFT4gjFyFslZWHSLYupwuXw4CGwr qlgbe3GsHeGs4b7387bwq+u+eNk6BesAUsrfTHavG/JCnHMt94yAQ4XNz6SVfYtQTYwe MieoLeC/lAUwPnyUxvg/oQicZnXrr+MERdYEtJ2q6MjaivkuL0Al7mmlNyqv6WB9v1g5 u+t+h28RLwojA0RsdXqugI6aoYZDa0VAAOkCw2ARhbfNIlSMyqly/iB2sTSmw7yKun+a P4dJjBB9nnrjw+woGEyGX3ehFvt01QCpGGR2lyzAtPlnSndzhpWTsvBagK6PyB3232n5 H7Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769204151; x=1769808951; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bMClnrU1ojs/oRDsTOTz3+XVnxCCRuf482L0kuY835M=; b=usJEVUOW7DlmQePT6MJkATPvhsi3JAOlZ71ZQhlH07bHLsR+SAY90iyhTN2Spk/HDA jBJrgs42ycWx7K0NIGaU0/uDsDiN61G+9fIjW+y+m4cNuJfl7+8ijg0tYz3T7w6KMwwJ 8eI6NSuLCqajSak4lAslf/DgTvSGEqVt1JUq8SkxApReKLbhrQzUlhjMxIIWfXEHb16+ gkaIhwaN1ogAc1heuNMbu7AwweXVh4O1H3fWDMIPCTtg2YHxM+f4Cmd03IebwLctu7C7 7Al7I/wBQWBDeIvy/Di9ZfWXy8TlhGLIfxqhnJObrKqY0CNWYjHDheDbWl0mldTJaVMH ikZA== X-Forwarded-Encrypted: i=1; AJvYcCV9fTVYcMBtqc/6c90TOPjY6v4jJAPnIY25+iQUCHG9BZDllQ80zaM2oJd+RUrK2y70Aznbt0g=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6tgDG1djCa+xntQhygBZWO8WEKp5atugblrmiRLQlcmG10aQk oEtgnbnwc/Pye/kQRdkBQJzT8N4Uuf1dI5vR0dDb4rknmrtlylapMGTi X-Gm-Gg: AZuq6aJGbaV8539fryBN1mNKGTWIUAJiTmjmrWk+fl3rPhFc8wWy3KyAQ2PaMhb8lij PdhqIhJHsmBziDFRHFZAMmUnCrq/+qnUEg/VSWgktOxofEAEeuXf7eZd/MyiQY6xrVFalMS5U0P LCH8J2cuTYm3hzPOAlHeRhEuh9SUwPeQlnK0KYn0Rl/1ML9scPhHoXhJHMDqP3jRImeQH426jhB XbKAPvod9Zqc1h7AaxPiK2xD1oyJ6dXNKGZV6HPkgR1gfWe/5rTI3HSyIWAbn8mIzQus29vswbt e0YRQERzudSAeRbRJWOj7ZnpV4QUqlk6C/zRJy6C9rSgzZ4oh7jWS2FxHyfq/HCWr0U/5cfpUqD TgYNOaF9EbwJTBJddmgWCumqZerOKVNgMBMg9anBIdYuSjUaWCumFfj1MvczShxMh2j2VyGFtbq Q6DmaDGsLbc7ekSKN6txsLT7KaaJZdaD22YYaA4yoj1d1TkVlEJei/NHYVYqle7e+ZnA== X-Received: by 2002:a05:600c:c113:b0:480:3ad0:64fb with SMTP id 5b1f17b1804b1-48050679699mr47943935e9.12.1769204150954; Fri, 23 Jan 2026 13:35:50 -0800 (PST) Received: from ?IPV6:2a02:a03f:a75e:9a00:b377:103e:67ba:8048? ([2a02:a03f:a75e:9a00:b377:103e:67ba:8048]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4804d4faecbsm33622255e9.1.2026.01.23.13.35.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 23 Jan 2026 13:35:50 -0800 (PST) Message-ID: <5dca897a-700f-41da-afa4-37a497346f97@gmail.com> Date: Fri, 23 Jan 2026 22:35:50 +0100 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v4 6/7] ipv6: Enforce Extension Header ordering To: Tom Herbert , davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org References: <20260121214925.112604-1-tom@herbertland.com> <20260121214925.112604-7-tom@herbertland.com> Content-Language: en-US From: Justin Iurman In-Reply-To: <20260121214925.112604-7-tom@herbertland.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 1/21/26 22:49, Tom Herbert wrote: > RFC8200 highly recommends that different Extension Headers be send in > a prescibed order and all Extension Header types occur at most once > in a packet with the expection of Destination Options that may > occur twice. This patch enforces the ordering be folowed in received > packets. It also disregrards Destination Options before the Routing > Header as those are unused in deployment asnd there is a proposal > to deprecate them in draft-herbert-deprecate-destops-before-rh. I'll have to pushback on this specifically, at least as long as draft-herbert-deprecate-destops-before-rh is not adopted and published (to be clear, I'm not against it, just that it's still an individual draft right now and there is no consensus). We're already at the edge of remaining compliant with RFC8200 with this series (which is fine considering its security gaps), so let's not rush by removing the DestOps before the Routing header. It can be done later, this series already mitigates DoS attacks quite well. FWIW, the rest of this patch makes sense. > The allowed order of Extension Headers is: > > IPv6 header > Hop-by-Hop Options header > Routing header > Fragment header > Authentication header > Encapsulating Security Payload header > Destination Options header > Upper-Layer header > > Each Extension Header may be present only once in a packet. > > net.ipv6.enforce_ext_hdr_order is a sysctl to enable or disable > enforcement of xtension Header order. If it is set to zero then > Extension Header order and number of occurences is not checked > in receive processeing (except for Hop-by-Hop Options that > must be the first Extension Header and can only occur once in > a packet. > > Signed-off-by: Tom Herbert > --- > include/net/netns/ipv6.h | 1 + > include/net/protocol.h | 16 ++++++++++++++++ > net/ipv6/af_inet6.c | 1 + > net/ipv6/exthdrs.c | 2 ++ > net/ipv6/ip6_input.c | 14 ++++++++++++++ > net/ipv6/reassembly.c | 1 + > net/ipv6/sysctl_net_ipv6.c | 7 +++++++ > net/ipv6/xfrm6_protocol.c | 2 ++ > 8 files changed, 44 insertions(+) > > diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h > index 34bdb1308e8f..2db56718ea60 100644 > --- a/include/net/netns/ipv6.h > +++ b/include/net/netns/ipv6.h > @@ -61,6 +61,7 @@ struct netns_sysctl_ipv6 { > u8 fib_notify_on_flag_change; > u8 icmpv6_error_anycast_as_unicast; > u8 icmpv6_errors_extension_mask; > + u8 enforce_ext_hdr_order; > }; > > struct netns_ipv6 { > diff --git a/include/net/protocol.h b/include/net/protocol.h > index b2499f88f8f8..70cc2d0fdc0c 100644 > --- a/include/net/protocol.h > +++ b/include/net/protocol.h > @@ -50,6 +50,21 @@ struct net_protocol { > }; > > #if IS_ENABLED(CONFIG_IPV6) > + > +/* Order of extension headers as prescribed in RFC8200. The ordering and > + * number of extension headers in a packet can be enforced in IPv6 receive > + * processing. Destination Options before the Routing Header is not included > + * in the list as they are unused in deployment and it has been proposed that > + * they be deprecated. See: > + * www.ietf.org/archive/id/draft-herbert-deprecate-destops-before-rh-01.txt > + */ > +#define IPV6_EXT_HDR_ORDER_HOP BIT(0) > +#define IPV6_EXT_HDR_ORDER_ROUTING BIT(1) > +#define IPV6_EXT_HDR_ORDER_FRAGMENT BIT(2) > +#define IPV6_EXT_HDR_ORDER_AUTH BIT(3) > +#define IPV6_EXT_HDR_ORDER_ESP BIT(4) > +#define IPV6_EXT_HDR_ORDER_DEST BIT(5) > + > struct inet6_protocol { > int (*handler)(struct sk_buff *skb); > > @@ -61,6 +76,7 @@ struct inet6_protocol { > > unsigned int flags; /* INET6_PROTO_xxx */ > u32 secret; > + u32 ext_hdr_order; > }; > > #define INET6_PROTO_NOPOLICY 0x1 > diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c > index bd29840659f3..43097360ce64 100644 > --- a/net/ipv6/af_inet6.c > +++ b/net/ipv6/af_inet6.c > @@ -980,6 +980,7 @@ static int __net_init inet6_net_init(struct net *net) > net->ipv6.sysctl.max_dst_opts_len = IP6_DEFAULT_MAX_DST_OPTS_LEN; > net->ipv6.sysctl.max_hbh_opts_len = IP6_DEFAULT_MAX_HBH_OPTS_LEN; > net->ipv6.sysctl.fib_notify_on_flag_change = 0; > + net->ipv6.sysctl.enforce_ext_hdr_order = 1; > atomic_set(&net->ipv6.fib6_sernum, 1); > > net->ipv6.sysctl.ioam6_id = IOAM6_DEFAULT_ID; > diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c > index 394e3397e4d4..2af16694db46 100644 > --- a/net/ipv6/exthdrs.c > +++ b/net/ipv6/exthdrs.c > @@ -845,11 +845,13 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) > static const struct inet6_protocol rthdr_protocol = { > .handler = ipv6_rthdr_rcv, > .flags = INET6_PROTO_NOPOLICY, > + .ext_hdr_order = IPV6_EXT_HDR_ORDER_ROUTING, > }; > > static const struct inet6_protocol destopt_protocol = { > .handler = ipv6_destopt_rcv, > .flags = INET6_PROTO_NOPOLICY, > + .ext_hdr_order = IPV6_EXT_HDR_ORDER_DEST, > }; > > static const struct inet6_protocol nodata_protocol = { > diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c > index 168ec07e31cc..5254ead5c226 100644 > --- a/net/ipv6/ip6_input.c > +++ b/net/ipv6/ip6_input.c > @@ -366,6 +366,7 @@ void ip6_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int nexthdr, > const struct inet6_protocol *ipprot; > struct inet6_dev *idev; > unsigned int nhoff; > + u32 ext_hdrs = 0; > SKB_DR(reason); > bool raw; > > @@ -427,6 +428,19 @@ void ip6_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int nexthdr, > goto discard; > } > } > + > + if (ipprot->ext_hdr_order && > + READ_ONCE(net->ipv6.sysctl.enforce_ext_hdr_order)) { > + /* The protocol is an extension header and EH ordering > + * is being enforced. Discard packet if we've already > + * seen this EH or one that is lower in the order list > + */ > + if (ipprot->ext_hdr_order <= ext_hdrs) > + goto discard; > + > + ext_hdrs |= ipprot->ext_hdr_order; > + } > + > if (!(ipprot->flags & INET6_PROTO_NOPOLICY)) { > if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) { > SKB_DR_SET(reason, XFRM_POLICY); > diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c > index 25ec8001898d..91dba72c5a3c 100644 > --- a/net/ipv6/reassembly.c > +++ b/net/ipv6/reassembly.c > @@ -414,6 +414,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb) > static const struct inet6_protocol frag_protocol = { > .handler = ipv6_frag_rcv, > .flags = INET6_PROTO_NOPOLICY, > + .ext_hdr_order = IPV6_EXT_HDR_ORDER_FRAGMENT, > }; > > #ifdef CONFIG_SYSCTL > diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c > index d2cd33e2698d..543b6acdb11d 100644 > --- a/net/ipv6/sysctl_net_ipv6.c > +++ b/net/ipv6/sysctl_net_ipv6.c > @@ -213,6 +213,13 @@ static struct ctl_table ipv6_table_template[] = { > .proc_handler = proc_doulongvec_minmax, > .extra2 = &ioam6_id_wide_max, > }, > + { > + .procname = "enforce_ext_hdr_order", > + .data = &init_net.ipv6.sysctl.enforce_ext_hdr_order, > + .maxlen = sizeof(u8), > + .mode = 0644, > + .proc_handler = proc_dou8vec_minmax, > + }, > }; > > static struct ctl_table ipv6_rotable[] = { > diff --git a/net/ipv6/xfrm6_protocol.c b/net/ipv6/xfrm6_protocol.c > index ea2f805d3b01..5826edf67f64 100644 > --- a/net/ipv6/xfrm6_protocol.c > +++ b/net/ipv6/xfrm6_protocol.c > @@ -197,12 +197,14 @@ static const struct inet6_protocol esp6_protocol = { > .handler = xfrm6_esp_rcv, > .err_handler = xfrm6_esp_err, > .flags = INET6_PROTO_NOPOLICY, > + .ext_hdr_order = IPV6_EXT_HDR_ORDER_ESP, > }; > > static const struct inet6_protocol ah6_protocol = { > .handler = xfrm6_ah_rcv, > .err_handler = xfrm6_ah_err, > .flags = INET6_PROTO_NOPOLICY, > + .ext_hdr_order = IPV6_EXT_HDR_ORDER_AUTH > }; > > static const struct inet6_protocol ipcomp6_protocol = {