summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornikolay@redhat.com <nikolay@redhat.com>2012-11-29 01:34:06 +0000
committerDavid S. Miller <davem@davemloft.net>2012-11-29 13:13:15 -0500
commit90fb6250c509cabd425b7ae4524053dba2e27e2c (patch)
treed8b5740916d8a3ba304fdffc347d029e132baa14
parentfbb0c41b814d497c656fc7be9e35456f139cb2fb (diff)
downloadop-kernel-dev-90fb6250c509cabd425b7ae4524053dba2e27e2c.zip
op-kernel-dev-90fb6250c509cabd425b7ae4524053dba2e27e2c.tar.gz
bonding: make arp_ip_target parameter checks consistent with sysfs
The module can be loaded with arp_ip_target="255.255.255.255" which makes it impossible to remove as the function in sysfs checks for that value, so we make the parameter checks consistent with sysfs. v2: Fix formatting v3: Make description text < 75 columns Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bonding/bond_main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 1445c7d..a7d4735 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4670,12 +4670,13 @@ static int bond_check_params(struct bond_params *params)
arp_ip_count++) {
/* not complete check, but should be good enough to
catch mistakes */
- if (!isdigit(arp_ip_target[arp_ip_count][0])) {
+ __be32 ip = in_aton(arp_ip_target[arp_ip_count]);
+ if (!isdigit(arp_ip_target[arp_ip_count][0]) ||
+ ip == 0 || ip == htonl(INADDR_BROADCAST)) {
pr_warning("Warning: bad arp_ip_target module parameter (%s), ARP monitoring will not be performed\n",
arp_ip_target[arp_ip_count]);
arp_interval = 0;
} else {
- __be32 ip = in_aton(arp_ip_target[arp_ip_count]);
arp_target[arp_ip_count] = ip;
}
}
OpenPOWER on IntegriCloud