From: David Lebrun <david.lebrun@uclouvain.be>
To: <netdev@vger.kernel.org>
Cc: David Lebrun <david.lebrun@uclouvain.be>
Subject: [RFC 7/9] ipv6: sr: add calls to verify and insert HMAC signatures
Date: Fri, 26 Aug 2016 17:54:10 +0200 [thread overview]
Message-ID: <1472226852-10075-3-git-send-email-david.lebrun@uclouvain.be> (raw)
In-Reply-To: <1472226767-9904-1-git-send-email-david.lebrun@uclouvain.be>
This patch enables the verification of the HMAC signature for transiting
SR-enabled packets, and its insertion on encapsulated/injected SRH.
Signed-off-by: David Lebrun <david.lebrun@uclouvain.be>
---
net/ipv6/exthdrs.c | 10 ++++++++++
net/ipv6/seg6_iptunnel.c | 17 +++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index e6f41fc..92b684a 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -49,6 +49,9 @@
#endif
#ifdef CONFIG_IPV6_SEG6
#include <linux/seg6.h>
+#ifdef CONFIG_IPV6_SEG6_HMAC
+#include <net/seg6_hmac.h>
+#endif
#endif
#include <linux/uaccess.h>
@@ -313,6 +316,13 @@ static int ipv6_srh_rcv(struct sk_buff *skb)
return -1;
}
+#ifdef CONFIG_IPV6_SEG6_HMAC
+ if (!seg6_hmac_validate_skb(skb)) {
+ kfree_skb(skb);
+ return -1;
+ }
+#endif
+
looped_back:
last_addr = hdr->segments;
diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c
index ce7218a..f115cc5 100644
--- a/net/ipv6/seg6_iptunnel.c
+++ b/net/ipv6/seg6_iptunnel.c
@@ -109,6 +109,14 @@ static int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh)
hdr->daddr = isrh->segments[isrh->first_segment];
set_tun_src(net, skb->dev, &hdr->daddr, &hdr->saddr);
+#ifdef CONFIG_IPV6_SEG6_HMAC
+ if (sr_get_flags(isrh) & SR6_FLAG_HMAC) {
+ err = seg6_push_hmac(net, &hdr->saddr, isrh);
+ if (unlikely(err))
+ return err;
+ }
+#endif
+
return 0;
}
@@ -118,6 +126,7 @@ static int seg6_do_srh_inline(struct sk_buff *skb, struct ipv6_sr_hdr *osrh)
struct ipv6hdr *hdr, *oldhdr;
struct ipv6_sr_hdr *isrh;
int hdrlen, err;
+ struct net *net = dev_net(skb_dst(skb)->dev);
hdrlen = (osrh->hdrlen + 1) << 3;
@@ -144,6 +153,14 @@ static int seg6_do_srh_inline(struct sk_buff *skb, struct ipv6_sr_hdr *osrh)
isrh->segments[0] = hdr->daddr;
hdr->daddr = isrh->segments[isrh->first_segment];
+#ifdef CONFIG_IPV6_SEG6_HMAC
+ if (sr_get_flags(isrh) & SR6_FLAG_HMAC) {
+ err = seg6_push_hmac(net, &hdr->saddr, isrh);
+ if (unlikely(err))
+ return err;
+ }
+#endif
+
return 0;
}
--
2.3.6
next prev parent reply other threads:[~2016-08-26 16:04 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-26 15:52 [RFC 0/9] add support for IPv6 Segment Routing David Lebrun
2016-08-26 15:52 ` [RFC 1/9] ipv6: implement dataplane support for rthdr type 4 (Segment Routing Header) David Lebrun
2016-08-31 14:51 ` Nicolas Dichtel
2016-09-01 13:11 ` David Lebrun
2016-09-01 13:58 ` Nicolas Dichtel
2016-08-31 17:13 ` Stephen Hemminger
2016-08-26 15:52 ` [RFC 2/9] ipv6: sr: add code base for control plane support of SR-IPv6 David Lebrun
2016-08-29 15:31 ` Roopa Prabhu
2016-08-31 14:57 ` Nicolas Dichtel
2016-09-01 13:21 ` David Lebrun
2016-09-05 10:05 ` Nicolas Dichtel
2016-08-31 14:59 ` Nicolas Dichtel
2016-08-31 17:10 ` Stephen Hemminger
2016-09-01 13:25 ` David Lebrun
2016-09-01 17:15 ` Stephen Hemminger
2016-08-31 17:11 ` Stephen Hemminger
2016-08-31 17:11 ` Stephen Hemminger
2016-08-26 15:52 ` [RFC 3/9] ipv6: route: export symbol ip6_route_input David Lebrun
2016-08-26 15:52 ` [RFC 4/9] ipv6: sr: add support for SRH encapsulation and injection with lwtunnels David Lebrun
2016-08-29 14:52 ` Roopa Prabhu
2016-09-01 13:32 ` David Lebrun
2016-08-26 15:54 ` [RFC 5/9] ipv6: sr: add core files for SR HMAC support David Lebrun
2016-08-26 15:54 ` [RFC 6/9] ipv6: sr: implement API to control SR HMAC structures David Lebrun
2016-08-26 15:54 ` David Lebrun [this message]
2016-08-26 15:54 ` [RFC 8/9] ipv6: add source address argument for ipv6_push_nfrag_opts David Lebrun
2016-08-26 15:54 ` [RFC 9/9] ipv6: sr: add support for SRH injection through setsockopt David Lebrun
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=1472226852-10075-3-git-send-email-david.lebrun@uclouvain.be \
--to=david.lebrun@uclouvain.be \
--cc=netdev@vger.kernel.org \
/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).