| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CALx6S34XW0DUBYJBHdCuegSLeDvS9d_e71xEduxVZfohGprrHQ@mail.gmail.com>
Date: Mon, 17 Oct 2016 10:07:20 -0700
From: Tom Herbert <tom@...bertland.com>
To: David Lebrun <david.lebrun@...ouvain.be>
Cc: Linux Kernel Network Developers <netdev@...r.kernel.org>
Subject: Re: [PATCH 2/9] ipv6: sr: add code base for control plane support of SR-IPv6
On Mon, Oct 17, 2016 at 7:42 AM, David Lebrun <david.lebrun@...ouvain.be> wrote:
> This patch adds the necessary hooks and structures to provide support
> for SR-IPv6 control plane, essentially the Generic Netlink commands
> that will be used for userspace control over the Segment Routing
> kernel structures.
>
> The genetlink commands provide control over two different structures:
> tunnel source and HMAC data. The tunnel source is the source address
> that will be used by default when encapsulating packets into an
> outer IPv6 header + SRH. If the tunnel source is set to :: then an
> address of the outgoing interface will be selected as the source.
>
> The HMAC commands currently just return ENOTSUPP and will be implemented
> in a future patch.
>
> Signed-off-by: David Lebrun <david.lebrun@...ouvain.be>
> ---
> include/linux/seg6_genl.h | 6 ++
> include/net/netns/ipv6.h | 3 +
> include/net/seg6.h | 41 ++++++++
> include/uapi/linux/seg6_genl.h | 33 +++++++
> net/ipv6/Makefile | 1 +
> net/ipv6/seg6.c | 212 +++++++++++++++++++++++++++++++++++++++++
> 6 files changed, 296 insertions(+)
> create mode 100644 include/linux/seg6_genl.h
> create mode 100644 include/net/seg6.h
> create mode 100644 include/uapi/linux/seg6_genl.h
> create mode 100644 net/ipv6/seg6.c
>
> diff --git a/include/linux/seg6_genl.h b/include/linux/seg6_genl.h
> new file mode 100644
> index 0000000..d6c3fb4f
> --- /dev/null
> +++ b/include/linux/seg6_genl.h
> @@ -0,0 +1,6 @@
> +#ifndef _LINUX_SEG6_GENL_H
> +#define _LINUX_SEG6_GENL_H
> +
> +#include <uapi/linux/seg6_genl.h>
> +
> +#endif
> diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
> index 10d0848..67825bb 100644
> --- a/include/net/netns/ipv6.h
> +++ b/include/net/netns/ipv6.h
> @@ -85,6 +85,9 @@ struct netns_ipv6 {
> #endif
> atomic_t dev_addr_genid;
> atomic_t fib6_sernum;
> +#ifdef CONFIG_IPV6_SEG6
> + struct seg6_pernet_data *seg6_data;
> +#endif
> };
>
> #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
> diff --git a/include/net/seg6.h b/include/net/seg6.h
> new file mode 100644
> index 0000000..89b819e
> --- /dev/null
> +++ b/include/net/seg6.h
> @@ -0,0 +1,41 @@
> +/*
> + * SR-IPv6 implementation
> + *
> + * Author:
> + * David Lebrun <david.lebrun@...ouvain.be>
> + *
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version
> + * 2 of the License, or (at your option) any later version.
> + */
> +
> +#ifndef _NET_SEG6_H
> +#define _NET_SEG6_H
> +
> +#include <linux/net.h>
> +#include <linux/ipv6.h>
> +
> +struct seg6_pernet_data {
> + struct mutex lock;
> + struct in6_addr __rcu *tun_src;
> +};
> +
> +static inline struct seg6_pernet_data *seg6_pernet(struct net *net)
> +{
> + return net->ipv6.seg6_data;
> +}
> +
> +static inline void seg6_pernet_lock(struct net *net)
> +{
> + mutex_lock(&seg6_pernet(net)->lock);
> +}
> +
> +static inline void seg6_pernet_unlock(struct net *net)
> +{
> + mutex_unlock(&seg6_pernet(net)->lock);
> +}
> +
IMO it's better not to hide mutex_lock/unlock in a static inline
function. Pairing mutex_lock with mutex_lock is critical and should be
each to see in code.
> +#endif
> +
> diff --git a/include/uapi/linux/seg6_genl.h b/include/uapi/linux/seg6_genl.h
> new file mode 100644
> index 0000000..4db988b
> --- /dev/null
> +++ b/include/uapi/linux/seg6_genl.h
> @@ -0,0 +1,33 @@
> +#ifndef _UAPI_LINUX_SEG6_GENL_H
> +#define _UAPI_LINUX_SEG6_GENL_H
> +
> +#define SEG6_GENL_NAME "SEG6"
> +#define SEG6_GENL_VERSION 0x1
> +
> +enum {
> + SEG6_ATTR_UNSPEC,
> + SEG6_ATTR_DST,
> + SEG6_ATTR_DSTLEN,
> + SEG6_ATTR_HMACKEYID,
> + SEG6_ATTR_SECRET,
> + SEG6_ATTR_SECRETLEN,
> + SEG6_ATTR_ALGID,
> + SEG6_ATTR_HMACINFO,
> + __SEG6_ATTR_MAX,
> +};
> +
> +#define SEG6_ATTR_MAX (__SEG6_ATTR_MAX - 1)
> +
> +enum {
> + SEG6_CMD_UNSPEC,
> + SEG6_CMD_SETHMAC,
> + SEG6_CMD_DUMPHMAC,
> + SEG6_CMD_SET_TUNSRC,
> + SEG6_CMD_GET_TUNSRC,
> + __SEG6_CMD_MAX,
> +};
> +
> +#define SEG6_CMD_MAX (__SEG6_CMD_MAX - 1)
> +
> +#endif
> +
> diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
> index c174ccb..5069257 100644
> --- a/net/ipv6/Makefile
> +++ b/net/ipv6/Makefile
> @@ -44,6 +44,7 @@ obj-$(CONFIG_IPV6_SIT) += sit.o
> obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
> obj-$(CONFIG_IPV6_GRE) += ip6_gre.o
> obj-$(CONFIG_IPV6_FOU) += fou6.o
> +obj-$(CONFIG_IPV6_SEG6) += seg6.o
>
> obj-y += addrconf_core.o exthdrs_core.o ip6_checksum.o ip6_icmp.o
> obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
> diff --git a/net/ipv6/seg6.c b/net/ipv6/seg6.c
> new file mode 100644
> index 0000000..8dafe7b
> --- /dev/null
> +++ b/net/ipv6/seg6.c
> @@ -0,0 +1,212 @@
> +/*
> + * SR-IPv6 implementation
> + *
> + * Author:
> + * David Lebrun <david.lebrun@...ouvain.be>
> + *
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * as published by the Free Software Foundation; either version
> + * 2 of the License, or (at your option) any later version.
> + */
> +
> +#include <linux/errno.h>
> +#include <linux/types.h>
> +#include <linux/socket.h>
> +#include <linux/net.h>
> +#include <linux/in6.h>
> +#include <linux/slab.h>
> +
> +#include <net/ipv6.h>
> +#include <net/protocol.h>
> +
> +#include <net/seg6.h>
> +#include <net/genetlink.h>
> +#include <linux/seg6.h>
> +#include <linux/seg6_genl.h>
> +
> +static const struct nla_policy seg6_genl_policy[SEG6_ATTR_MAX + 1] = {
> + [SEG6_ATTR_DST] = { .type = NLA_BINARY,
> + .len = sizeof(struct in6_addr) },
> + [SEG6_ATTR_DSTLEN] = { .type = NLA_S32, },
> + [SEG6_ATTR_HMACKEYID] = { .type = NLA_U32, },
> + [SEG6_ATTR_SECRET] = { .type = NLA_BINARY, },
> + [SEG6_ATTR_SECRETLEN] = { .type = NLA_U8, },
> + [SEG6_ATTR_ALGID] = { .type = NLA_U8, },
> + [SEG6_ATTR_HMACINFO] = { .type = NLA_NESTED, },
> +};
> +
> +static struct genl_family seg6_genl_family = {
> + .id = GENL_ID_GENERATE,
> + .hdrsize = 0,
> + .name = SEG6_GENL_NAME,
> + .version = SEG6_GENL_VERSION,
> + .maxattr = SEG6_ATTR_MAX,
> + .netnsok = true,
> +};
> +
> +static int seg6_genl_sethmac(struct sk_buff *skb, struct genl_info *info)
> +{
> + return -ENOTSUPP;
Is the intent to implement this later?
> +}
> +
> +static int seg6_genl_set_tunsrc(struct sk_buff *skb, struct genl_info *info)
> +{
> + struct net *net = genl_info_net(info);
> + struct seg6_pernet_data *sdata = seg6_pernet(net);
> + struct in6_addr *val, *t_old, *t_new;
> +
> + if (!info->attrs[SEG6_ATTR_DST])
> + return -EINVAL;
> +
> + val = (struct in6_addr *)nla_data(info->attrs[SEG6_ATTR_DST]);
> + t_new = kmemdup(val, sizeof(*val), GFP_KERNEL);
> +
> + seg6_pernet_lock(net);
> +
> + t_old = sdata->tun_src;
> + rcu_assign_pointer(sdata->tun_src, t_new);
> +
> + seg6_pernet_unlock(net);
> +
> + synchronize_net();
> + kfree(t_old);
> +
> + return 0;
> +}
> +
> +static int seg6_genl_get_tunsrc(struct sk_buff *skb, struct genl_info *info)
> +{
> + struct net *net = genl_info_net(info);
> + struct sk_buff *msg;
> + void *hdr;
> + struct in6_addr *tun_src;
> +
> + msg = genlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
> + if (!msg)
> + return -ENOMEM;
> +
> + hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq,
> + &seg6_genl_family, 0, SEG6_CMD_GET_TUNSRC);
> + if (!hdr)
> + goto free_msg;
> +
> + rcu_read_lock();
> + tun_src = rcu_dereference(seg6_pernet(net)->tun_src);
> +
> + if (nla_put(msg, SEG6_ATTR_DST, sizeof(struct in6_addr), tun_src))
> + goto nla_put_failure;
> +
> + rcu_read_unlock();
> +
> + genlmsg_end(msg, hdr);
> + genlmsg_reply(msg, info);
> +
> + return 0;
> +
> +nla_put_failure:
> + rcu_read_unlock();
> + genlmsg_cancel(msg, hdr);
> +free_msg:
> + nlmsg_free(msg);
> + return -ENOMEM;
> +}
> +
> +static int seg6_genl_dumphmac(struct sk_buff *skb, struct netlink_callback *cb)
> +{
> + return -ENOTSUPP;
> +}
> +
> +static const struct genl_ops seg6_genl_ops[] = {
> + {
> + .cmd = SEG6_CMD_SETHMAC,
> + .doit = seg6_genl_sethmac,
> + .policy = seg6_genl_policy,
> + .flags = GENL_ADMIN_PERM,
> + },
> + {
> + .cmd = SEG6_CMD_DUMPHMAC,
> + .dumpit = seg6_genl_dumphmac,
> + .policy = seg6_genl_policy,
> + .flags = GENL_ADMIN_PERM,
> + },
> + {
> + .cmd = SEG6_CMD_SET_TUNSRC,
> + .doit = seg6_genl_set_tunsrc,
> + .policy = seg6_genl_policy,
> + .flags = GENL_ADMIN_PERM,
> + },
> + {
> + .cmd = SEG6_CMD_GET_TUNSRC,
> + .doit = seg6_genl_get_tunsrc,
> + .policy = seg6_genl_policy,
> + .flags = GENL_ADMIN_PERM,
> + },
> +};
> +
> +static int __net_init seg6_net_init(struct net *net)
> +{
> + struct seg6_pernet_data *sdata;
> +
> + sdata = kzalloc(sizeof(*sdata), GFP_KERNEL);
> + if (!sdata)
> + return -ENOMEM;
> +
> + mutex_init(&sdata->lock);
> +
> + sdata->tun_src = kzalloc(sizeof(*sdata->tun_src), GFP_KERNEL);
> + if (!sdata->tun_src) {
> + kfree(sdata);
> + return -ENOMEM;
> + }
> +
> + net->ipv6.seg6_data = sdata;
> +
> + return 0;
> +}
> +
> +static void __net_exit seg6_net_exit(struct net *net)
> +{
> + struct seg6_pernet_data *sdata = seg6_pernet(net);
> +
> + kfree(sdata->tun_src);
> + kfree(sdata);
> +}
> +
> +static struct pernet_operations ip6_segments_ops = {
> + .init = seg6_net_init,
> + .exit = seg6_net_exit,
> +};
> +
> +static int __init seg6_init(void)
> +{
> + int err = -ENOMEM;
> +
> + err = genl_register_family_with_ops(&seg6_genl_family, seg6_genl_ops);
> + if (err)
> + goto out;
> +
> + err = register_pernet_subsys(&ip6_segments_ops);
> + if (err)
> + goto out_unregister_genl;
> +
> + pr_info("Segment Routing with IPv6\n");
> +
> +out:
> + return err;
> +out_unregister_genl:
> + genl_unregister_family(&seg6_genl_family);
> + goto out;
> +}
> +module_init(seg6_init);
> +
> +static void __exit seg6_exit(void)
> +{
> + unregister_pernet_subsys(&ip6_segments_ops);
> + genl_unregister_family(&seg6_genl_family);
> +}
> +module_exit(seg6_exit);
> +
> +MODULE_DESCRIPTION("Segment Routing with IPv6 core");
> +MODULE_LICENSE("GPL v2");
> --
> 2.7.3
>
Powered by blists - more mailing lists