Commit 592335a4 authored by Hangbin Liu's avatar Hangbin Liu Committed by David S. Miller

bonding: accept unsolicited NA message

The unsolicited NA message with all-nodes multicast dest address should
be valid, as this also means the link could reach the target.

Also rename bond_validate_ns() to bond_validate_na().
Reported-by: default avatarLiLiang <liali@redhat.com>
Fixes: 5e1eeef6 ("bonding: NS target should accept link local address")
Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd16eb94
...@@ -3201,12 +3201,19 @@ static bool bond_has_this_ip6(struct bonding *bond, struct in6_addr *addr) ...@@ -3201,12 +3201,19 @@ static bool bond_has_this_ip6(struct bonding *bond, struct in6_addr *addr)
return ret; return ret;
} }
static void bond_validate_ns(struct bonding *bond, struct slave *slave, static void bond_validate_na(struct bonding *bond, struct slave *slave,
struct in6_addr *saddr, struct in6_addr *daddr) struct in6_addr *saddr, struct in6_addr *daddr)
{ {
int i; int i;
if (ipv6_addr_any(saddr) || !bond_has_this_ip6(bond, daddr)) { /* Ignore NAs that:
* 1. Source address is unspecified address.
* 2. Dest address is neither all-nodes multicast address nor
* exist on bond interface.
*/
if (ipv6_addr_any(saddr) ||
(!ipv6_addr_equal(daddr, &in6addr_linklocal_allnodes) &&
!bond_has_this_ip6(bond, daddr))) {
slave_dbg(bond->dev, slave->dev, "%s: sip %pI6c tip %pI6c not found\n", slave_dbg(bond->dev, slave->dev, "%s: sip %pI6c tip %pI6c not found\n",
__func__, saddr, daddr); __func__, saddr, daddr);
return; return;
...@@ -3249,14 +3256,14 @@ static int bond_na_rcv(const struct sk_buff *skb, struct bonding *bond, ...@@ -3249,14 +3256,14 @@ static int bond_na_rcv(const struct sk_buff *skb, struct bonding *bond,
* see bond_arp_rcv(). * see bond_arp_rcv().
*/ */
if (bond_is_active_slave(slave)) if (bond_is_active_slave(slave))
bond_validate_ns(bond, slave, saddr, daddr); bond_validate_na(bond, slave, saddr, daddr);
else if (curr_active_slave && else if (curr_active_slave &&
time_after(slave_last_rx(bond, curr_active_slave), time_after(slave_last_rx(bond, curr_active_slave),
curr_active_slave->last_link_up)) curr_active_slave->last_link_up))
bond_validate_ns(bond, slave, saddr, daddr); bond_validate_na(bond, slave, saddr, daddr);
else if (curr_arp_slave && else if (curr_arp_slave &&
bond_time_in_interval(bond, slave_last_tx(curr_arp_slave), 1)) bond_time_in_interval(bond, slave_last_tx(curr_arp_slave), 1))
bond_validate_ns(bond, slave, saddr, daddr); bond_validate_na(bond, slave, saddr, daddr);
out: out:
return RX_HANDLER_ANOTHER; return RX_HANDLER_ANOTHER;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment