public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Tom Herbert <tom@herbertland.com>
To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org,
	justin.iurman@uliege.be, willemdebruijn.kernel@gmail.com,
	pabeni@redhat.com
Cc: Tom Herbert <tom@herbertland.com>,
	Justin Iurman <justin.iurman@gmail.com>
Subject: [PATCH net-next v7 04/10] ipv6: Set HBH and DestOpt limits to 2
Date: Wed,  4 Feb 2026 14:51:48 -0800	[thread overview]
Message-ID: <20260204225154.58245-5-tom@herbertland.com> (raw)
In-Reply-To: <20260204225154.58245-1-tom@herbertland.com>

Set the default limits of non-padding Hop-by-Hop and Destination
options to 2. This means that if a packet contains more than two
non-padding options then it will be dropped. The previous limit
was 8, but that was too liberal considering that the stack only
support two Destination Options and the most Hop-by-Hop options
likely to ever be in the same packet are IOAM and JUMBO. The limit
can be increased via sysctl for private use and experimentation.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Reviewed-by: Justin Iurman <justin.iurman@gmail.com>
---
 include/net/ipv6.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index c27b9d7aeb7c..29aecd8e9617 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -86,9 +86,12 @@ struct ip_tunnel_info;
  * silently discarded.
  */
 
-/* Default limits for Hop-by-Hop and Destination options */
-#define IP6_DEFAULT_MAX_DST_OPTS_CNT	 8
-#define IP6_DEFAULT_MAX_HBH_OPTS_CNT	 8
+/* Default limits for Hop-by-Hop and Destination non-padding options. The
+ * default value for both is 2. This sets a limit at two non-padding options
+ * (see sysctl documentation)
+ */
+#define IP6_DEFAULT_MAX_DST_OPTS_CNT	 2
+#define IP6_DEFAULT_MAX_HBH_OPTS_CNT	 2
 #define IP6_DEFAULT_MAX_DST_OPTS_LEN	 INT_MAX /* No limit */
 #define IP6_DEFAULT_MAX_HBH_OPTS_LEN	 INT_MAX /* No limit */
 
-- 
2.43.0


  parent reply	other threads:[~2026-02-04 22:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-04 22:51 [PATCH net-next v7 00/10] ipv6: Address ext hdr DoS vulnerabilities Tom Herbert
2026-02-04 22:51 ` [PATCH net-next v7 01/10] ipv6: Check of max HBH or DestOp sysctl is zero and drop if it is Tom Herbert
2026-02-04 22:51 ` [PATCH net-next v7 02/10] ipv6: Cleanup IPv6 TLV definitions Tom Herbert
2026-02-04 22:51 ` [PATCH net-next v7 03/10] ipv6: Add case for IPV6_TLV_TNL_ENCAP_LIMIT in EH TLV switch Tom Herbert
2026-02-04 22:51 ` Tom Herbert [this message]
2026-02-04 22:51 ` [PATCH net-next v7 05/10] ipv6: Document defaults for max_{dst|hbh}_opts_number sysctls Tom Herbert
2026-02-04 22:51 ` [PATCH net-next v7 06/10] ipv6: Enforce Extension Header ordering Tom Herbert
2026-02-04 22:51 ` [PATCH net-next v7 07/10] ipv6: Document enforce_ext_hdr_order sysctl Tom Herbert
2026-02-04 22:51 ` [PATCH net-next v7 08/10] test: Add proto_nums.py in networking selftests Tom Herbert
2026-02-04 22:51 ` [PATCH net-next v7 09/10] test: Add ext_hdr.py " Tom Herbert
2026-02-06  2:45 ` [PATCH net-next v7 00/10] ipv6: Address ext hdr DoS vulnerabilities Jakub Kicinski
     [not found]   ` <CALx6S3576DLyd18BnFRkaNMhxb-Y3bsy8YJXy3-Q43EQVppEDQ@mail.gmail.com>
2026-02-11 19:16     ` Jakub Kicinski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260204225154.58245-5-tom@herbertland.com \
    --to=tom@herbertland.com \
    --cc=davem@davemloft.net \
    --cc=justin.iurman@gmail.com \
    --cc=justin.iurman@uliege.be \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=willemdebruijn.kernel@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox