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: Tue, 15 Mar 2022 03:30:05 -0400 From: Sun Shouxin <sunshouxin@...natelecom.cn> To: j.vosburgh@...il.com, vfalico@...il.com, andy@...yhouse.net, davem@...emloft.net, kuba@...nel.org, yoshfuji@...ux-ipv6.org, dsahern@...nel.org, oliver@...kum.org Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org, huyd12@...natelecom.cn, sunshouxin@...natelecom.cn Subject: [PATCH v2 1/4] net:ipv6:Refactor ndisc_send_na to support sending na by slave directly Refactor ndisc_send_na to support sending na by slave directly and export it for bonding usage. Suggested-by: Hu Yadi <huyd12@...natelecom.cn> Signed-off-by: Sun Shouxin <sunshouxin@...natelecom.cn> --- changelog: v1-->v2: remove ndisc_bond_send_na and refactor ndisc_send_na --- include/net/ipv6_stubs.h | 3 +- include/net/ndisc.h | 9 +++++- net/ipv6/ndisc.c | 65 +++++++++++++++++++++++++++++----------- 3 files changed, 57 insertions(+), 20 deletions(-) diff --git a/include/net/ipv6_stubs.h b/include/net/ipv6_stubs.h index 45e0339be6fa..2b64ea6590b6 100644 --- a/include/net/ipv6_stubs.h +++ b/include/net/ipv6_stubs.h @@ -56,7 +56,8 @@ struct ipv6_stub { void (*udpv6_encap_enable)(void); void (*ndisc_send_na)(struct net_device *dev, const struct in6_addr *daddr, const struct in6_addr *solicited_addr, - bool router, bool solicited, bool override, bool inc_opt); + bool router, bool solicited, bool override, + bool inc_opt, void *data); #if IS_ENABLED(CONFIG_XFRM) void (*xfrm6_local_rxpmtu)(struct sk_buff *skb, u32 mtu); int (*xfrm6_udp_encap_rcv)(struct sock *sk, struct sk_buff *skb); diff --git a/include/net/ndisc.h b/include/net/ndisc.h index da7eec8669ec..e71702a44a3d 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -107,6 +107,12 @@ struct nd_opt_hdr { __u8 nd_opt_len; } __packed; +struct nd_sendinfo { + __u16 vlanid; + void *mac_dst; + const void *mac_src; +}; + /* ND options */ struct ndisc_options { struct nd_opt_hdr *nd_opt_array[__ND_OPT_ARRAY_MAX]; @@ -460,7 +466,8 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr, const struct in6_addr *daddr); void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr, const struct in6_addr *solicited_addr, - bool router, bool solicited, bool override, bool inc_opt); + bool router, bool solicited, bool override, bool inc_opt, + void *data); void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target); diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index fcb288b0ae13..aa2f5693350a 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -518,29 +518,37 @@ EXPORT_SYMBOL(ndisc_send_skb); void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr, const struct in6_addr *solicited_addr, - bool router, bool solicited, bool override, bool inc_opt) + bool router, bool solicited, bool override, bool inc_opt, + void *data) { struct sk_buff *skb; struct in6_addr tmpaddr; struct inet6_ifaddr *ifp; const struct in6_addr *src_addr; struct nd_msg *msg; + struct nd_sendinfo *sendinfo = data; + struct net *net = dev_net(dev); + struct sock *sk = net->ipv6.ndisc_sk; int optlen = 0; - /* for anycast or proxy, solicited_addr != src_addr */ - ifp = ipv6_get_ifaddr(dev_net(dev), solicited_addr, dev, 1); - if (ifp) { - src_addr = solicited_addr; - if (ifp->flags & IFA_F_OPTIMISTIC) - override = false; - inc_opt |= ifp->idev->cnf.force_tllao; - in6_ifa_put(ifp); + if (!sendinfo) { + /* for anycast or proxy, solicited_addr != src_addr */ + ifp = ipv6_get_ifaddr(dev_net(dev), solicited_addr, dev, 1); + if (ifp) { + src_addr = solicited_addr; + if (ifp->flags & IFA_F_OPTIMISTIC) + override = false; + inc_opt |= ifp->idev->cnf.force_tllao; + in6_ifa_put(ifp); + } else { + if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, + inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs, + &tmpaddr)) + return; + src_addr = &tmpaddr; + } } else { - if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, - inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs, - &tmpaddr)) - return; - src_addr = &tmpaddr; + src_addr = solicited_addr; } if (!dev->addr_len) @@ -568,9 +576,30 @@ void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr, ndisc_fill_addr_option(skb, ND_OPT_TARGET_LL_ADDR, dev->dev_addr, NDISC_NEIGHBOUR_ADVERTISEMENT); + if (!sendinfo) { + ndisc_send_skb(skb, daddr, src_addr); + } else { + if (sendinfo->vlanid) + __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), + sendinfo->vlanid); + + msg->icmph.icmp6_cksum = csum_ipv6_magic(src_addr, daddr, skb->len, + IPPROTO_ICMPV6, + csum_partial(&msg->icmph, + skb->len, 0)); - ndisc_send_skb(skb, daddr, src_addr); + ip6_nd_hdr(skb, src_addr, daddr, inet6_sk(sk)->hop_limit, skb->len); + + skb->protocol = htons(ETH_P_IPV6); + skb->dev = dev; + if (dev_hard_header(skb, dev, ETH_P_IPV6, sendinfo->mac_dst, + sendinfo->mac_src, skb->len) < 0) + return; + + dev_queue_xmit(skb); + } } +EXPORT_SYMBOL(ndisc_send_na); static void ndisc_send_unsol_na(struct net_device *dev) { @@ -591,7 +620,7 @@ static void ndisc_send_unsol_na(struct net_device *dev) ndisc_send_na(dev, &in6addr_linklocal_allnodes, &ifa->addr, /*router=*/ !!idev->cnf.forwarding, /*solicited=*/ false, /*override=*/ true, - /*inc_opt=*/ true); + /*inc_opt=*/ true, NULL); } read_unlock_bh(&idev->lock); @@ -932,7 +961,7 @@ static void ndisc_recv_ns(struct sk_buff *skb) if (dad) { ndisc_send_na(dev, &in6addr_linklocal_allnodes, &msg->target, - !!is_router, false, (ifp != NULL), true); + !!is_router, false, ifp, true, NULL); goto out; } @@ -954,7 +983,7 @@ static void ndisc_recv_ns(struct sk_buff *skb) NDISC_NEIGHBOUR_SOLICITATION, &ndopts); if (neigh || !dev->header_ops) { ndisc_send_na(dev, saddr, &msg->target, !!is_router, - true, (ifp != NULL && inc), inc); + true, (ifp && inc), inc, NULL); if (neigh) neigh_release(neigh); } -- 2.27.0
Powered by blists - more mailing lists