* [PATCH v2] bonding: make arp_ip_target parameter checks consistent with sysfs
@ 2012-11-28 16:44 Nikolay Aleksandrov
2012-11-29 11:34 ` [PATCH v3] " Nikolay Aleksandrov
0 siblings, 1 reply; 4+ messages in thread
From: Nikolay Aleksandrov @ 2012-11-28 16:44 UTC (permalink / raw)
To: netdev; +Cc: andy, fubar, davem
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
Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
---
drivers/net/bonding/bond_main.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 5f5b69f..d29159a 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4706,12 +4706,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;
}
}
--
1.7.11.7
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v3] bonding: make arp_ip_target parameter checks consistent with sysfs
2012-11-28 16:44 [PATCH v2] bonding: make arp_ip_target parameter checks consistent with sysfs Nikolay Aleksandrov
@ 2012-11-29 11:34 ` Nikolay Aleksandrov
2012-11-29 17:39 ` Jay Vosburgh
0 siblings, 1 reply; 4+ messages in thread
From: Nikolay Aleksandrov @ 2012-11-29 11:34 UTC (permalink / raw)
To: netdev; +Cc: fubar, andy, davem
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>
---
drivers/net/bonding/bond_main.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 5f5b69f..d29159a 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4706,12 +4706,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;
}
}
--
1.7.11.7
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v3] bonding: make arp_ip_target parameter checks consistent with sysfs
2012-11-29 11:34 ` [PATCH v3] " Nikolay Aleksandrov
@ 2012-11-29 17:39 ` Jay Vosburgh
2012-11-29 18:14 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Jay Vosburgh @ 2012-11-29 17:39 UTC (permalink / raw)
To: Nikolay Aleksandrov; +Cc: netdev, andy, davem
Nikolay Aleksandrov <nikolay@redhat.com> wrote:
> 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>
>---
> drivers/net/bonding/bond_main.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>index 5f5b69f..d29159a 100644
>--- a/drivers/net/bonding/bond_main.c
>+++ b/drivers/net/bonding/bond_main.c
>@@ -4706,12 +4706,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;
> }
> }
>--
>1.7.11.7
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v3] bonding: make arp_ip_target parameter checks consistent with sysfs
2012-11-29 17:39 ` Jay Vosburgh
@ 2012-11-29 18:14 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2012-11-29 18:14 UTC (permalink / raw)
To: fubar; +Cc: nikolay, netdev, andy
From: Jay Vosburgh <fubar@us.ibm.com>
Date: Thu, 29 Nov 2012 09:39:09 -0800
> Nikolay Aleksandrov <nikolay@redhat.com> wrote:
>
>> 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>
Applied.
Thanks a lot everyone.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-11-29 18:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-28 16:44 [PATCH v2] bonding: make arp_ip_target parameter checks consistent with sysfs Nikolay Aleksandrov
2012-11-29 11:34 ` [PATCH v3] " Nikolay Aleksandrov
2012-11-29 17:39 ` Jay Vosburgh
2012-11-29 18:14 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).