| 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: <20250522085703.16475-1-tonghao@bamaicloud.com>
Date: Thu, 22 May 2025 16:57:03 +0800
From: Tonghao Zhang <tonghao@...aicloud.com>
To: netdev@...r.kernel.org
Cc: Tonghao Zhang <tonghao@...aicloud.com>,
Jay Vosburgh <jv@...sburgh.net>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Simon Horman <horms@...nel.org>,
Jonathan Corbet <corbet@....net>,
Andrew Lunn <andrew+netdev@...n.ch>,
Nikolay Aleksandrov <razor@...ckwall.org>,
Zengbing Tu <tuzengbing@...iglobal.com>
Subject: [PATCH net-next v1 1/1] net: bonding: add bond_is_icmpv6_nd() helper
Introduce ipv6 ns/nd checking helper, using skb_header_pointer()
instead of pskb_network_may_pull() on tx path.
alb_determine_nd introduced from commit 0da8aa00bfcfe
Cc: Jay Vosburgh <jv@...sburgh.net>
Cc: "David S. Miller" <davem@...emloft.net>
Cc: Eric Dumazet <edumazet@...gle.com>
Cc: Jakub Kicinski <kuba@...nel.org>
Cc: Paolo Abeni <pabeni@...hat.com>
Cc: Simon Horman <horms@...nel.org>
Cc: Jonathan Corbet <corbet@....net>
Cc: Andrew Lunn <andrew+netdev@...n.ch>
Cc: Nikolay Aleksandrov <razor@...ckwall.org>
Signed-off-by: Tonghao Zhang <tonghao@...aicloud.com>
Signed-off-by: Zengbing Tu <tuzengbing@...iglobal.com>
---
drivers/net/bonding/bond_alb.c | 32 +++++++-------------------------
drivers/net/bonding/bond_main.c | 17 ++---------------
include/net/bonding.h | 19 +++++++++++++++++++
3 files changed, 28 insertions(+), 40 deletions(-)
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 7edf0fd58c34..beb80c487a29 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -19,7 +19,6 @@
#include <linux/in.h>
#include <net/arp.h>
#include <net/ipv6.h>
-#include <net/ndisc.h>
#include <asm/byteorder.h>
#include <net/bonding.h>
#include <net/bond_alb.h>
@@ -1281,27 +1280,6 @@ static int alb_set_mac_address(struct bonding *bond, void *addr)
return res;
}
-/* determine if the packet is NA or NS */
-static bool alb_determine_nd(struct sk_buff *skb, struct bonding *bond)
-{
- struct ipv6hdr *ip6hdr;
- struct icmp6hdr *hdr;
-
- if (!pskb_network_may_pull(skb, sizeof(*ip6hdr)))
- return true;
-
- ip6hdr = ipv6_hdr(skb);
- if (ip6hdr->nexthdr != IPPROTO_ICMPV6)
- return false;
-
- if (!pskb_network_may_pull(skb, sizeof(*ip6hdr) + sizeof(*hdr)))
- return true;
-
- hdr = icmp6_hdr(skb);
- return hdr->icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT ||
- hdr->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION;
-}
-
/************************ exported alb functions ************************/
int bond_alb_initialize(struct bonding *bond, int rlb_enabled)
@@ -1382,7 +1360,7 @@ struct slave *bond_xmit_tlb_slave_get(struct bonding *bond,
if (!is_multicast_ether_addr(eth_data->h_dest)) {
switch (skb->protocol) {
case htons(ETH_P_IPV6):
- if (alb_determine_nd(skb, bond))
+ if (bond_is_icmpv6_nd(skb))
break;
fallthrough;
case htons(ETH_P_IP):
@@ -1468,16 +1446,20 @@ struct slave *bond_xmit_alb_slave_get(struct bonding *bond,
break;
}
- if (alb_determine_nd(skb, bond)) {
+ if (bond_is_icmpv6_nd(skb)) {
do_tx_balance = false;
break;
}
- /* The IPv6 header is pulled by alb_determine_nd */
/* Additionally, DAD probes should not be tx-balanced as that
* will lead to false positives for duplicate addresses and
* prevent address configuration from working.
*/
+ if (!pskb_network_may_pull(skb, sizeof(*ip6hdr))) {
+ do_tx_balance = false;
+ break;
+ }
+
ip6hdr = ipv6_hdr(skb);
if (ipv6_addr_any(&ip6hdr->saddr)) {
do_tx_balance = false;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 7f03ca9bcbba..b3f0ac8e0720 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -5340,10 +5340,6 @@ static bool bond_should_broadcast_neighbor(struct sk_buff *skb,
struct net_device *dev)
{
struct bonding *bond = netdev_priv(dev);
- struct {
- struct ipv6hdr ip6;
- struct icmp6hdr icmp6;
- } *combined, _combined;
if (!static_branch_unlikely(&bond_bcast_neigh_enabled))
return false;
@@ -5351,19 +5347,10 @@ static bool bond_should_broadcast_neighbor(struct sk_buff *skb,
if (!bond->params.broadcast_neighbor)
return false;
- if (skb->protocol == htons(ETH_P_ARP))
+ if (skb->protocol == htons(ETH_P_ARP) ||
+ (skb->protocol == htons(ETH_P_IPV6) && bond_is_icmpv6_nd(skb)))
return true;
- if (skb->protocol == htons(ETH_P_IPV6)) {
- combined = skb_header_pointer(skb, skb_mac_header_len(skb),
- sizeof(_combined),
- &_combined);
- if (combined && combined->ip6.nexthdr == NEXTHDR_ICMP &&
- (combined->icmp6.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION ||
- combined->icmp6.icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT))
- return true;
- }
-
return false;
}
diff --git a/include/net/bonding.h b/include/net/bonding.h
index e06f0d63b2c1..32d9fcca858c 100644
--- a/include/net/bonding.h
+++ b/include/net/bonding.h
@@ -29,6 +29,7 @@
#include <net/bond_options.h>
#include <net/ipv6.h>
#include <net/addrconf.h>
+#include <net/ndisc.h>
#define BOND_MAX_ARP_TARGETS 16
#define BOND_MAX_NS_TARGETS BOND_MAX_ARP_TARGETS
@@ -814,4 +815,22 @@ static inline netdev_tx_t bond_tx_drop(struct net_device *dev, struct sk_buff *s
return NET_XMIT_DROP;
}
+static inline bool bond_is_icmpv6_nd(struct sk_buff *skb)
+{
+ struct {
+ struct ipv6hdr ip6;
+ struct icmp6hdr icmp6;
+ } *combined, _combined;
+
+ combined = skb_header_pointer(skb, skb_mac_header_len(skb),
+ sizeof(_combined),
+ &_combined);
+ if (combined && combined->ip6.nexthdr == NEXTHDR_ICMP &&
+ (combined->icmp6.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION ||
+ combined->icmp6.icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT))
+ return true;
+
+ return false;
+}
+
#endif /* _NET_BONDING_H */
--
2.34.1
Powered by blists - more mailing lists