From: Tom Herbert <tom@herbertland.com>
To: davem@davemloft.net, netdev@vger.kernel.org, dlebrun@google.com,
ahabdels.dev@gmail.com
Cc: Tom Herbert <tom@quantonium.net>
Subject: [RFC PATCH 6/6] seg6: Add support to rearrange SRH for AH ICV calculation
Date: Fri, 31 May 2019 09:48:40 -0700 [thread overview]
Message-ID: <1559321320-9444-7-git-send-email-tom@quantonium.net> (raw)
In-Reply-To: <1559321320-9444-1-git-send-email-tom@quantonium.net>
Mutable fields related to segment routing are: destination address,
segments left, and modifiable TLVs (those whose high order bit is set).
Add support to rearrange a segment routing (type 4) routing header to
handle these mutability requirements. This is described in
draft-herbert-ipv6-srh-ah-00.
Signed-off-by: Tom Herbert <tom@quantonium.net>
---
net/ipv6/ah6.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 032491c..0c5ca29 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -27,6 +27,7 @@
#include <net/icmp.h>
#include <net/ipv6.h>
#include <net/protocol.h>
+#include <net/seg6.h>
#include <net/xfrm.h>
#define IPV6HDR_BASELEN 8
@@ -141,6 +142,13 @@ static bool zero_out_mutable_opts(struct ipv6_opt_hdr *opthdr)
return __zero_out_mutable_opts(opthdr, 2, 0x20, IPV6_TLV_PAD1);
}
+static bool zero_out_mutable_srh_opts(struct ipv6_sr_hdr *srh)
+{
+ return __zero_out_mutable_opts((struct ipv6_opt_hdr *)srh,
+ seg6_tlv_offset(srh), 0x80,
+ SR6_TLV_PAD1);
+}
+
#if IS_ENABLED(CONFIG_IPV6_MIP6)
/**
* ipv6_rearrange_destopt - rearrange IPv6 destination options header
@@ -243,6 +251,20 @@ static bool ipv6_rearrange_type0_rthdr(struct ipv6hdr *iph,
return true;
}
+static bool ipv6_rearrange_type4_rthdr(struct ipv6hdr *iph,
+ struct ipv6_rt_hdr *rthdr)
+{
+ struct ipv6_sr_hdr *srh = (struct ipv6_sr_hdr *)rthdr;
+
+ if (!zero_out_mutable_srh_opts(srh))
+ return false;
+
+ rthdr->segments_left = 0;
+ iph->daddr = srh->segments[0];
+
+ return true;
+}
+
static bool ipv6_rearrange_rthdr(struct ipv6hdr *iph, struct ipv6_rt_hdr *rthdr)
{
switch (rthdr->type) {
@@ -251,6 +273,8 @@ static bool ipv6_rearrange_rthdr(struct ipv6hdr *iph, struct ipv6_rt_hdr *rthdr)
/* fallthrough */
case IPV6_SRCRT_TYPE_0: /* Deprecated */
return ipv6_rearrange_type0_rthdr(iph, rthdr);
+ case IPV6_SRCRT_TYPE_4:
+ return ipv6_rearrange_type4_rthdr(iph, rthdr);
default:
/* Bad or unidentified routing header, we don't know how
* to fix this header for security purposes. Return failure.
--
2.7.4
next prev parent reply other threads:[~2019-05-31 16:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-31 16:48 [RFC PATCH 0/6] seg6: Segment routing fixes Tom Herbert
2019-05-31 16:48 ` [RFC PATCH 1/6] seg6: Fix TLV definitions Tom Herbert
2019-05-31 16:48 ` [RFC PATCH 2/6] seg6: Implement a TLV parsing loop Tom Herbert
2019-05-31 16:48 ` [RFC PATCH 3/6] seg6: Obsolete unused SRH flags Tom Herbert
2019-05-31 16:48 ` [RFC PATCH 4/6] ah6: Create function __zero_out_mutable_opts Tom Herbert
2019-05-31 16:48 ` [RFC PATCH 5/6] ah6: Be explicit about which routing types are processed Tom Herbert
2019-05-31 16:48 ` Tom Herbert [this message]
2019-05-31 17:07 ` [RFC PATCH 6/6] seg6: Add support to rearrange SRH for AH ICV calculation Ahmed Abdelsalam
2019-05-31 17:34 ` Tom Herbert
2019-06-02 9:54 ` Ahmed Abdelsalam
2019-06-02 15:48 ` Tom Herbert
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=1559321320-9444-7-git-send-email-tom@quantonium.net \
--to=tom@herbertland.com \
--cc=ahabdels.dev@gmail.com \
--cc=davem@davemloft.net \
--cc=dlebrun@google.com \
--cc=netdev@vger.kernel.org \
--cc=tom@quantonium.net \
/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;
as well as URLs for NNTP newsgroup(s).