* [PATCH net] bonding: add arp_ip_target checks when install the module
@ 2013-12-04 10:59 Ding Tianhong
2013-12-06 1:58 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ding Tianhong @ 2013-12-04 10:59 UTC (permalink / raw)
To: Jay Vosburgh, Andy Gospodarek, David S. Miller,
Nikolay Aleksandrov, Veaceslav Falico, Netdev
When I install the bonding with the wrong arp_ip_target,
just like arp_ip_target=500.500.500.500, the arp_ip_target
was transfored to 245.245.245.244 and stored in the ip
target success, it is uncorrect, so I add checks to avoid
adding wrong address.
The in4_pton() will set wrong ip address to 0.0.0.0 and
return 0, also use the micro IS_IP_TARGET_UNUSABLE_ADDRESS
to simplify the code.
Signed-off-by: Ding Tianhong <dingtianhong@huawei•com>
---
drivers/net/bonding/bond_main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index a141f40..a48cfbb 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4157,9 +4157,9 @@ static int bond_check_params(struct bond_params *params)
(arp_ip_count < BOND_MAX_ARP_TARGETS) && arp_ip_target[i]; i++) {
/* not complete check, but should be good enough to
catch mistakes */
- __be32 ip = in_aton(arp_ip_target[i]);
- if (!isdigit(arp_ip_target[i][0]) || ip == 0 ||
- ip == htonl(INADDR_BROADCAST)) {
+ __be32 ip;
+ if (!in4_pton(arp_ip_target[i], -1, (u8 *)&ip, -1, NULL) ||
+ IS_IP_TARGET_UNUSABLE_ADDRESS(ip)) {
pr_warning("Warning: bad arp_ip_target module parameter (%s), ARP monitoring will not be performed\n",
arp_ip_target[i]);
arp_interval = 0;
--
1.7.12
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net] bonding: add arp_ip_target checks when install the module
2013-12-04 10:59 [PATCH net] bonding: add arp_ip_target checks when install the module Ding Tianhong
@ 2013-12-06 1:58 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-12-06 1:58 UTC (permalink / raw)
To: dingtianhong; +Cc: fubar, andy, nikolay, vfalico, netdev
From: Ding Tianhong <dingtianhong@huawei•com>
Date: Wed, 4 Dec 2013 18:59:31 +0800
> When I install the bonding with the wrong arp_ip_target,
> just like arp_ip_target=500.500.500.500, the arp_ip_target
> was transfored to 245.245.245.244 and stored in the ip
> target success, it is uncorrect, so I add checks to avoid
> adding wrong address.
>
> The in4_pton() will set wrong ip address to 0.0.0.0 and
> return 0, also use the micro IS_IP_TARGET_UNUSABLE_ADDRESS
> to simplify the code.
>
> Signed-off-by: Ding Tianhong <dingtianhong@huawei•com>
Applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-06 1:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-04 10:59 [PATCH net] bonding: add arp_ip_target checks when install the module Ding Tianhong
2013-12-06 1:58 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox