| 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
| ||
|
Date: Wed, 4 May 2016 14:23:22 +0200
From: Stefan Schmidt <stefan@....samsung.com>
To: Alexander Aring <aar@...gutronix.de>, linux-wpan@...r.kernel.org
Cc: kernel@...gutronix.de, marcel@...tmann.org,
jukka.rissanen@...ux.intel.com, hannes@...essinduktion.org,
mcr@...delman.ca, werner@...esberger.net,
linux-bluetooth@...r.kernel.org, netdev@...r.kernel.org,
"David S . Miller" <davem@...emloft.net>,
Alexey Kuznetsov <kuznet@....inr.ac.ru>,
James Morris <jmorris@...ei.org>,
Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>,
Patrick McHardy <kaber@...sh.net>
Subject: Re: [PATCHv2 bluetooth-next 08/10] ipv6: export ndisc functions
Hello.
On 20/04/16 10:19, Alexander Aring wrote:
> This patch exports some neighbour discovery functions which can be used
> by 6lowpan neighbour discovery ops functionality then.
>
> Cc: David S. Miller<davem@...emloft.net>
> Cc: Alexey Kuznetsov<kuznet@....inr.ac.ru>
> Cc: James Morris<jmorris@...ei.org>
> Cc: Hideaki YOSHIFUJI<yoshfuji@...ux-ipv6.org>
> Cc: Patrick McHardy<kaber@...sh.net>
> Signed-off-by: Alexander Aring<aar@...gutronix.de>
> ---
> include/net/ndisc.h | 16 ++++++++++++++++
> net/ipv6/addrconf.c | 1 +
> net/ipv6/ndisc.c | 28 ++++++++++------------------
> 3 files changed, 27 insertions(+), 18 deletions(-)
>
> diff --git a/include/net/ndisc.h b/include/net/ndisc.h
> index 14ed016..35a4396 100644
> --- a/include/net/ndisc.h
> +++ b/include/net/ndisc.h
> @@ -53,6 +53,15 @@ enum {
>
> #include <net/neighbour.h>
>
> +/* Set to 3 to get tracing... */
> +#define ND_DEBUG 1
> +
> +#define ND_PRINTK(val, level, fmt, ...) \
> +do { \
> + if (val <= ND_DEBUG) \
> + net_##level##_ratelimited(fmt, ##__VA_ARGS__); \
> +} while (0)
> +
> struct ctl_table;
> struct inet6_dev;
> struct net_device;
> @@ -267,6 +276,13 @@ int ndisc_late_init(void);
> void ndisc_late_cleanup(void);
> void ndisc_cleanup(void);
>
> +void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
> + int data_len);
> +struct sk_buff *ndisc_alloc_skb(struct net_device *dev, int len);
> +void ndisc_send_skb(struct sk_buff *skb, const struct in6_addr *daddr,
> + const struct in6_addr *saddr);
> +int pndisc_is_router(const void *pkey, struct net_device *dev);
> +
> int ndisc_rcv(struct sk_buff *skb);
>
> void ndisc_send_rs(struct net_device *dev,
> diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
> index a2ef04b..8f05ef8 100644
> --- a/net/ipv6/addrconf.c
> +++ b/net/ipv6/addrconf.c
> @@ -1775,6 +1775,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *add
>
> return result;
> }
> +EXPORT_SYMBOL(ipv6_get_ifaddr);
>
> /* Gets referenced address, destroys ifaddr */
>
> diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
> index 297080a..dc8bfec 100644
> --- a/net/ipv6/ndisc.c
> +++ b/net/ipv6/ndisc.c
> @@ -73,15 +73,6 @@
> #include <linux/netfilter.h>
> #include <linux/netfilter_ipv6.h>
>
> -/* Set to 3 to get tracing... */
> -#define ND_DEBUG 1
> -
> -#define ND_PRINTK(val, level, fmt, ...) \
> -do { \
> - if (val <= ND_DEBUG) \
> - net_##level##_ratelimited(fmt, ##__VA_ARGS__); \
> -} while (0)
> -
> static u32 ndisc_hash(const void *pkey,
> const struct net_device *dev,
> __u32 *hash_rnd);
> @@ -150,8 +141,8 @@ struct neigh_table nd_tbl = {
> };
> EXPORT_SYMBOL_GPL(nd_tbl);
>
> -static void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
> - int data_len)
> +void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
> + int data_len)
> {
> int pad = ndisc_addr_option_pad(skb->dev->type);
> int space = ndisc_opt_addr_space(skb->dev, data_len);
> @@ -171,6 +162,7 @@ static void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
> if (space > 0)
> memset(opt, 0, space);
> }
> +EXPORT_SYMBOL(ndisc_fill_addr_option);
Hmm, one export in this files uses EXPORT_SYMBOL while another one uses
EXPORT_SYMBOL_GPL. Not sure which one is preferred in this file.
>
> static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur,
> struct nd_opt_hdr *end)
> @@ -378,8 +370,7 @@ static void pndisc_destructor(struct pneigh_entry *n)
> ipv6_dev_mc_dec(dev, &maddr);
> }
>
> -static struct sk_buff *ndisc_alloc_skb(struct net_device *dev,
> - int len)
> +struct sk_buff *ndisc_alloc_skb(struct net_device *dev, int len)
> {
> int hlen = LL_RESERVED_SPACE(dev);
> int tlen = dev->needed_tailroom;
> @@ -406,6 +397,7 @@ static struct sk_buff *ndisc_alloc_skb(struct net_device *dev,
>
> return skb;
> }
> +EXPORT_SYMBOL(ndisc_alloc_skb);
Same here.
>
> static void ip6_nd_hdr(struct sk_buff *skb,
> const struct in6_addr *saddr,
> @@ -428,9 +420,8 @@ static void ip6_nd_hdr(struct sk_buff *skb,
> hdr->daddr = *daddr;
> }
>
> -static void ndisc_send_skb(struct sk_buff *skb,
> - const struct in6_addr *daddr,
> - const struct in6_addr *saddr)
> +void ndisc_send_skb(struct sk_buff *skb, const struct in6_addr *daddr,
> + const struct in6_addr *saddr)
> {
> struct dst_entry *dst = skb_dst(skb);
> struct net *net = dev_net(skb->dev);
> @@ -479,6 +470,7 @@ static void ndisc_send_skb(struct sk_buff *skb,
>
> rcu_read_unlock();
> }
> +EXPORT_SYMBOL(ndisc_send_skb);
And here.
>
> static void ip6_ndisc_send_na(struct net_device *dev,
> const struct in6_addr *daddr,
> @@ -692,8 +684,7 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb)
> }
> }
>
> -static int pndisc_is_router(const void *pkey,
> - struct net_device *dev)
> +int pndisc_is_router(const void *pkey, struct net_device *dev)
> {
> struct pneigh_entry *n;
> int ret = -1;
> @@ -706,6 +697,7 @@ static int pndisc_is_router(const void *pkey,
>
> return ret;
> }
> +EXPORT_SYMBOL(pndisc_is_router);
>
> static void ip6_ndisc_recv_ns(struct sk_buff *skb)
> {
Reviewed-by: Stefan Schmidt<stefan@....samsung.com>
regards
Stefan Schmidt
Powered by blists - more mailing lists